Merge pull request #31805 from colemanw/spookyTestFix

SearchKit - Fix unit test assumptions
civicrm · Jan 16, 2025 · 9769d21 · 9769d21
2 parents 2c9c157 + ffd4dcf
commit 9769d21
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/ext/search_kit/tests/phpunit/api/v4/SearchDisplay/SearchRunTest.php b/ext/search_kit/tests/phpunit/api/v4/SearchDisplay/SearchRunTest.php
@@ -1330,15 +1330,16 @@ public function testCssRules() {
   public function testIcons() {
     $subject = uniqid(__FUNCTION__);
 
-    $source = Contact::create(FALSE)->execute()->first();
+    $source = $this->createTestRecord('Contact');
 
     $activities = [
       ['activity_type_id:name' => 'Meeting', 'subject' => $subject, 'status_id:name' => 'Scheduled'],
       ['activity_type_id:name' => 'Phone Call', 'subject' => $subject, 'status_id:name' => 'Completed'],
     ];
-    Activity::save(FALSE)
-      ->addDefault('source_contact_id', $source['id'])
-      ->setRecords($activities)->execute();
+    $this->saveTestRecords('Activity', [
+      'defaults' => ['source_contact_id' => $source['id']],
+      'records' => $activities,
+    ]);
 
     $search = [
       'api_entity' => 'Activity',
@@ -1348,7 +1349,9 @@ public function testIcons() {
           'id',
         ],
         'orderBy' => [],
-        'where' => [],
+        'where' => [
+          ['subject', '=', $subject],
+        ],
         'groupBy' => [],
         'join' => [],
         'having' => [],

diff --git a/ext/search_kit/tests/phpunit/api/v4/SearchDisplay/SearchRunWithCustomFieldTest.php b/ext/search_kit/tests/phpunit/api/v4/SearchDisplay/SearchRunWithCustomFieldTest.php
@@ -267,7 +267,7 @@ public function testJoinWithCustomFieldEndingIn_() {
             'GROUP_CONCAT(DISTINCT Contact_ActivityContact_Activity_01.testactivity2.testactivity_:label) AS GROUP_CONCAT_Contact_ActivityContact_Activity_01_testactivity2_testactivity__label',
           ],
           'orderBy' => [],
-          'where' => [['contact_type:name', '=', 'Individual']],
+          'where' => [['id', '=', $contact['id']]],
           'groupBy' => ['id'],
           'join' => [
             ['Activity AS Contact_ActivityContact_Activity_01', 'INNER', 'ActivityContact',