From: Eileen McNaughton Date: Thu, 13 Apr 2023 19:02:26 +0000 (+1200) Subject: Cleanup relationships X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=dce30b4a25aa2e47db490a8a8146f2829cbf54d6;p=civicrm-core.git Cleanup relationships --- diff --git a/tests/phpunit/CRM/Dedupe/MergerTest.php b/tests/phpunit/CRM/Dedupe/MergerTest.php index 18e80a8262..e4466f3e9c 100644 --- a/tests/phpunit/CRM/Dedupe/MergerTest.php +++ b/tests/phpunit/CRM/Dedupe/MergerTest.php @@ -35,6 +35,7 @@ class CRM_Dedupe_MergerTest extends CiviUnitTestCase { 'civicrm_group_contact', 'civicrm_group', 'civicrm_prevnext_cache', + 'civicrm_relationship', ]); if ($this->hookClass) { // Do this here to flush the entityTables cache on teardown. diff --git a/tests/phpunit/api/v3/JobTest.php b/tests/phpunit/api/v3/JobTest.php index f0c6f3dc0f..f3a033f399 100644 --- a/tests/phpunit/api/v3/JobTest.php +++ b/tests/phpunit/api/v3/JobTest.php @@ -59,8 +59,7 @@ class api_v3_JobTest extends CiviUnitTestCase { public function tearDown(): void { $this->resetHooks(); $this->quickCleanUpFinancialEntities(); - $this->quickCleanup(['civicrm_contact', 'civicrm_address', 'civicrm_email', 'civicrm_website', 'civicrm_phone', 'civicrm_job', 'civicrm_action_log', 'civicrm_action_schedule', 'civicrm_group', 'civicrm_group_contact'], TRUE); - $this->quickCleanup(['civicrm_contact', 'civicrm_address', 'civicrm_email', 'civicrm_website', 'civicrm_phone'], TRUE); + $this->quickCleanup(['civicrm_contact', 'civicrm_address', 'civicrm_email', 'civicrm_relationship', 'civicrm_website', 'civicrm_phone', 'civicrm_job', 'civicrm_action_log', 'civicrm_action_schedule', 'civicrm_group', 'civicrm_group_contact'], TRUE); foreach ($this->originalValues as $entity => $entities) { foreach ($entities as $values) { $this->callAPISuccess($entity, 'create', $values);