From 00cc2e4b3df5a37c0ab8df54f08f6cace979f20b Mon Sep 17 00:00:00 2001 From: Seamus Lee Date: Sat, 9 Nov 2019 09:40:22 +1100 Subject: [PATCH] Add in unit test for dev/mailing#56 and dev/mailing#57 and also fix issue where by mailing_name has been namespaced also in 5.20 --- CRM/Mailing/BAO/Mailing.php | 4 +--- tests/phpunit/api/v3/JobProcessMailingTest.php | 6 ++++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CRM/Mailing/BAO/Mailing.php b/CRM/Mailing/BAO/Mailing.php index 8631ac032a..3c76c6c0a7 100644 --- a/CRM/Mailing/BAO/Mailing.php +++ b/CRM/Mailing/BAO/Mailing.php @@ -1839,9 +1839,7 @@ ORDER BY civicrm_email.is_bulkmail DESC $report['mailing'] = []; foreach (array_keys(self::fields()) as $field) { - if ($field == 'mailing_modified_date') { - $field = 'modified_date'; - } + $field = self::fields()[$field]['name']; $report['mailing'][$field] = $mailing->$field; } diff --git a/tests/phpunit/api/v3/JobProcessMailingTest.php b/tests/phpunit/api/v3/JobProcessMailingTest.php index 6cdf544f88..032ba138ae 100644 --- a/tests/phpunit/api/v3/JobProcessMailingTest.php +++ b/tests/phpunit/api/v3/JobProcessMailingTest.php @@ -177,6 +177,12 @@ class api_v3_JobProcessMailingTest extends CiviUnitTestCase { //Execute the job and it should send the mailing to the recipients now. $this->callAPISuccess('job', 'process_mailing', []); $this->_mut->assertRecipients($this->getRecipients(1, 2)); + // Ensure that loading the report produces no errors. + $report = CRM_Mailing_BAO_Mailing::report($result['id']); + // dev/mailing#56 dev/mailing#57 Ensure that for completed mailings the jobs array is not empty. + $this->assertTrue(!empty($report['jobs'])); + // Ensure that mailing name is correctly stored in the report. + $this->assertEquals('mailing name', $report['mailing']['name']); } /** -- 2.25.1