Update tests to ignore packaged saved searches

diff --git a/ext/legacycustomsearches/tests/phpunit/Civi/Searches/SampleTest.php b/ext/legacycustomsearches/tests/phpunit/Civi/Searches/SampleTest.php
index 737723c1cc5740e2a090f005db1525c760372fb6..a8e065a178cd8ff470ff2722982448625fcd1582 100644 (file)
--- a/ext/legacycustomsearches/tests/phpunit/Civi/Searches/SampleTest.php
+++ b/ext/legacycustomsearches/tests/phpunit/Civi/Searches/SampleTest.php
@@ -237,7 +237,7 @@ class SampleTest extends TestCase implements HeadlessInterface, HookInterface, T
         'Household - CA - 2',
       ]),
     ];
-    $searches = SavedSearch::get()->addSelect('*')->execute();
+    $searches = SavedSearch::get()->addSelect('*')->addWhere('has_base', '=', FALSE)->execute();
     foreach ($searches as $index => $search) {
       $formValues = CRM_Contact_BAO_SavedSearch::getFormValues($search['id']);
       $obj = new CRM_Contact_Form_Search_Custom_Sample($formValues);

diff --git a/tests/phpunit/CRM/Mailing/Form/Task/AdhocMailingTest.php b/tests/phpunit/CRM/Mailing/Form/Task/AdhocMailingTest.php
index c92eb940b71740fdee1376cca0c075ae1487d6e9..5277f5a69e79d986787bc3117aa8d911735513b4 100644 (file)
--- a/tests/phpunit/CRM/Mailing/Form/Task/AdhocMailingTest.php
+++ b/tests/phpunit/CRM/Mailing/Form/Task/AdhocMailingTest.php
@@ -44,7 +44,7 @@ class CRM_Mailing_Form_Task_AdhocMailingTest extends CiviUnitTestCase {
     catch (CRM_Core_Exception_PrematureExitException $e) {
       // Nothing to see here.
     }
-    $savedSearch = $this->callAPISuccessGetSingle('SavedSearch', []);
+    $savedSearch = $this->callAPISuccessGetSingle('SavedSearch', ['where' => [['has_base', '=', FALSE]]]);
     $this->assertEquals($formValues, $savedSearch['form_values']);
   }
 

diff --git a/tests/phpunit/api/v4/Action/CurrentFilterTest.php b/tests/phpunit/api/v4/Action/CurrentFilterTest.php
index 43093ef3e4703b41103a082b8d6169787eb2685e..1aba88b3ec8dd580be73b2acbf71564a06daf2d6 100644 (file)
--- a/tests/phpunit/api/v4/Action/CurrentFilterTest.php
+++ b/tests/phpunit/api/v4/Action/CurrentFilterTest.php
@@ -150,9 +150,9 @@ class CurrentFilterTest extends Api4TestBase implements TransactionalInterface {
       'name' => 'expired',
     ])->execute()->first();
 
-    $getCurrent = (array) SavedSearch::get()->addWhere('is_current', '=', TRUE)->execute()->indexBy('id');
-    $notCurrent = (array) SavedSearch::get()->addWhere('is_current', '=', FALSE)->execute()->indexBy('id');
-    $getAll = (array) SavedSearch::get()->addSelect('is_current')->execute()->indexBy('id');
+    $getCurrent = (array) SavedSearch::get()->addWhere('is_current', '=', TRUE)->addWhere('has_base', '=', FALSE)->execute()->indexBy('id');
+    $notCurrent = (array) SavedSearch::get()->addWhere('is_current', '=', FALSE)->addWhere('has_base', '=', FALSE)->execute()->indexBy('id');
+    $getAll = (array) SavedSearch::get()->addSelect('is_current')->addWhere('has_base', '=', FALSE)->execute()->indexBy('id');
 
     $this->assertTrue($getAll[$current['id']]['is_current']);
     $this->assertTrue($getAll[$indefinite['id']]['is_current']);