From b381547b2f2943c63597fd0ceb5d896141547977 Mon Sep 17 00:00:00 2001 From: Coleman Watts Date: Mon, 3 Apr 2023 22:12:47 -0400 Subject: [PATCH] Campaign - Allow writeRecord to autogenerate name from title, fix tests The Campaign BAO was autogenerating a name from the title but without the dedupe checking feature performed by writeRecord, so it was getting in the way of that safeguard. --- CRM/Campaign/BAO/Campaign.php | 4 ---- tests/phpunit/CRM/Activity/Form/Task/PDFTest.php | 1 - tests/phpunit/CRM/Contribute/ActionMapping/ByTypeTest.php | 6 ++++-- tests/phpunit/CiviTest/CiviUnitTestCase.php | 3 +-- 4 files changed, 5 insertions(+), 9 deletions(-) diff --git a/CRM/Campaign/BAO/Campaign.php b/CRM/Campaign/BAO/Campaign.php index ee01e49e3e..13bf0f6f50 100644 --- a/CRM/Campaign/BAO/Campaign.php +++ b/CRM/Campaign/BAO/Campaign.php @@ -42,10 +42,6 @@ class CRM_Campaign_BAO_Campaign extends CRM_Campaign_DAO_Campaign { if (empty($params['created_date'])) { $params['created_date'] = date('YmdHis'); } - - if (empty($params['name'])) { - $params['name'] = CRM_Utils_String::titleToVar($params['title'], 64); - } } /** @var \CRM_Campaign_DAO_Campaign $campaign */ diff --git a/tests/phpunit/CRM/Activity/Form/Task/PDFTest.php b/tests/phpunit/CRM/Activity/Form/Task/PDFTest.php index d4bad18f68..3f0056dd0a 100644 --- a/tests/phpunit/CRM/Activity/Form/Task/PDFTest.php +++ b/tests/phpunit/CRM/Activity/Form/Task/PDFTest.php @@ -23,7 +23,6 @@ class CRM_Activity_Form_Task_PDFTest extends CiviUnitTestCase { */ public function testCreateDocumentBasicTokens(): void { CRM_Core_BAO_ConfigSetting::enableComponent('CiviCase'); - $this->enableCiviCampaign(); $case = $this->createCase($this->individualCreate()); $activity = $this->activityCreate([ diff --git a/tests/phpunit/CRM/Contribute/ActionMapping/ByTypeTest.php b/tests/phpunit/CRM/Contribute/ActionMapping/ByTypeTest.php index e963b4ffea..b978f64594 100644 --- a/tests/phpunit/CRM/Contribute/ActionMapping/ByTypeTest.php +++ b/tests/phpunit/CRM/Contribute/ActionMapping/ByTypeTest.php @@ -180,8 +180,10 @@ class CRM_Contribute_ActionMapping_ByTypeTest extends \Civi\ActionSchedule\Abstr * Create a contribution record for Alice with type "Member Dues". */ public function addAliceDues(): void { - $this->enableCiviCampaign(); - $campaignID = $this->campaignCreate(); + $campaignID = $this->campaignCreate([ + 'title' => 'Campaign', + 'name' => 'big_campaign', + ]); $this->ids['Contribution']['alice'] = $this->callAPISuccess('Contribution', 'create', [ 'contact_id' => $this->contacts['alice']['id'], 'receive_date' => date('Ymd', strtotime($this->targetDate)), diff --git a/tests/phpunit/CiviTest/CiviUnitTestCase.php b/tests/phpunit/CiviTest/CiviUnitTestCase.php index 690fee8ba6..334a68ff23 100644 --- a/tests/phpunit/CiviTest/CiviUnitTestCase.php +++ b/tests/phpunit/CiviTest/CiviUnitTestCase.php @@ -1358,8 +1358,7 @@ class CiviUnitTestCase extends PHPUnit\Framework\TestCase { public function campaignCreate($params = [], $reloadConfig = TRUE) { $this->enableCiviCampaign($reloadConfig); $campaign = $this->callAPISuccess('campaign', 'create', array_merge([ - 'name' => 'big_campaign', - 'title' => 'Campaign', + 'title' => 'big campaign', ], $params)); return $campaign['id']; } -- 2.25.1