From cfc646cbca02118c30f9c7b278d908506e3a7949 Mon Sep 17 00:00:00 2001 From: demeritcowboy Date: Mon, 19 Jul 2021 12:37:50 -0400 Subject: [PATCH] fix intermittent api4 test --- tests/phpunit/api/v4/Action/BaseCustomValueTest.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests/phpunit/api/v4/Action/BaseCustomValueTest.php b/tests/phpunit/api/v4/Action/BaseCustomValueTest.php index 73cb89825d..94c45e328d 100644 --- a/tests/phpunit/api/v4/Action/BaseCustomValueTest.php +++ b/tests/phpunit/api/v4/Action/BaseCustomValueTest.php @@ -31,6 +31,11 @@ abstract class BaseCustomValueTest extends UnitTestCase { * @throws \API_Exception */ public function tearDown(): void { + $optgroups = CustomField::get(FALSE)->addSelect('option_group_id')->addWhere('option_group_id', 'IS NOT NULL')->execute(); + foreach ($optgroups as $optgroup) { + \Civi\Api4\OptionValue::delete(FALSE)->addWhere('option_group_id', '=', $optgroup['option_group_id'])->execute(); + \Civi\Api4\OptionGroup::delete(FALSE)->addWhere('id', '=', $optgroup['option_group_id'])->execute(); + } CustomField::delete(FALSE)->addWhere('id', '>', 0)->execute(); CustomGroup::delete(FALSE)->addWhere('id', '>', 0)->execute(); parent::tearDown(); -- 2.25.1