Skip to content

Commit

Permalink
Merge pull request #25996 from eileenmcnaughton/test_clean
Browse files Browse the repository at this point in the history
[TESTS] Fix some campaign cleanup
  • Loading branch information
colemanw authored Apr 4, 2023
2 parents 2854694 + 37444e1 commit 3689362
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 1 deletion.
1 change: 1 addition & 0 deletions tests/phpunit/CRM/Batch/Form/EntryTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,7 @@ public function setUp(): void {
*/
public function tearDown(): void {
$this->quickCleanUpFinancialEntities();
$this->quickCleanup(['civicrm_campaign']);
$this->relationshipTypeDelete($this->relationshipTypeID);
if ($this->callAPISuccessGetCount('membership', ['id' => $this->membershipTypeID])) {
$this->membershipTypeDelete(['id' => $this->membershipTypeID]);
Expand Down
2 changes: 1 addition & 1 deletion tests/phpunit/CRM/Core/BAO/CustomGroupTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class CRM_Core_BAO_CustomGroupTest extends CiviUnitTestCase {
* @throws \CRM_Core_Exception
*/
public function tearDown(): void {
$this->quickCleanup(['civicrm_contact'], TRUE);
$this->quickCleanup(['civicrm_contact', 'civicrm_campaign'], TRUE);
parent::tearDown();
}

Expand Down
1 change: 1 addition & 0 deletions tests/phpunit/CRM/Core/Payment/AuthorizeNetIPNTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ public function setUp(): void {

public function tearDown(): void {
$this->quickCleanUpFinancialEntities();
$this->quickCleanup(['civicrm_campaign']);
$this->restoreMembershipTypes();
parent::tearDown();
}
Expand Down
1 change: 1 addition & 0 deletions tests/phpunit/CRM/Core/Payment/PayPalIPNTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ public function setUp(): void {
*/
public function tearDown(): void {
$this->quickCleanUpFinancialEntities();
$this->quickCleanup(['civicrm_campaign']);
parent::tearDown();
}

Expand Down
1 change: 1 addition & 0 deletions tests/phpunit/CRM/Core/Payment/PaypalProTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ public function setUp(): void {

public function tearDown(): void {
$this->quickCleanUpFinancialEntities();
$this->quickCleanup(['civicrm_campaign']);
parent::tearDown();
}

Expand Down

0 comments on commit 3689362

Please sign in to comment.