Eileen has submitted this change and it was merged. Change subject: Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment ......................................................................
Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment 0255bd7 Re-queue damaged jobs via UI 8d6214c Fix code for MasterCard debit b8abd08 Add more Latin American methods for AstroPay 427d474 Associate CiviMail record with the right contact 40d4f7e CiviCRM submodule update - export speed fixes Change-Id: I828a9150706dd57ff862c9f972ea122adbf7dec2 --- D sites/all/modules/wmf_communication/tests/phpunit/CiviMailTest.php 1 file changed, 0 insertions(+), 104 deletions(-) Approvals: Eileen: Looks good to me, approved jenkins-bot: Verified diff --git a/sites/all/modules/wmf_communication/tests/phpunit/CiviMailTest.php b/sites/all/modules/wmf_communication/tests/phpunit/CiviMailTest.php deleted file mode 100644 index f250943..0000000 --- a/sites/all/modules/wmf_communication/tests/phpunit/CiviMailTest.php +++ /dev/null @@ -1,104 +0,0 @@ -<<<<<<< HEAD (ff0e0c Merge branch 'master' of https://gerrit.wikimedia.org/r/wiki) -======= -<?php -namespace wmf_communication; - -/** - * Tests for CiviMail helper classes - * @group CiviMail - * @group WmfCommunication - */ -class CiviMailTest extends CiviMailTestBase { - - public function testAddMailing() { - $name = 'test_mailing'; - $revision = mt_rand(); - $storedMailing = $this->mailStore->addMailing( - $this->source, - $name, - $this->body, - $this->subject, - $revision - ); - $this->assertInstanceOf( - 'wmf_communication\ICiviMailingRecord', - $storedMailing, - 'addMailing should return an ICiviMailingRecord' - ); - $this->assertTrue( - is_numeric( $storedMailing->getMailingID() ), - 'CiviMailingRecord should have a numeric mailing ID' - ); - } - - public function testGetMailing() { - $name = 'test_mailing'; - $revision = mt_rand(); - $storedMailing = $this->mailStore->addMailing( - $this->source, - $name, - $this->body, - $this->subject, - $revision - ); - $retrievedMailing = $this->mailStore->getMailing( - $this->source, - $name, - $revision - ); - $this->assertEquals( - $storedMailing->getMailingID(), - $retrievedMailing->getMailingID(), - 'Retrieved mailing has wrong MailingID' - ); - $this->assertEquals( - $storedMailing->getJobID(), - $retrievedMailing->getJobID(), - 'Retrieved mailing has wrong JobID' - ); - } - - /** - * @expectedException wmf_communication\CiviMailingMissingException - */ - public function testMissingMailing() { - $this->mailStore->getMailing( 'fakeSource', 'fakeName', mt_rand() ); - } - - public function testAddQueueRecord() { - $name = 'test_mailing'; - $revision = mt_rand(); - $storedMailing = $this->mailStore->addMailing( - $this->source, - $name, - $this->body, - $this->subject, - $revision - ); - $queueRecord = $this->mailStore->addQueueRecord( - $storedMailing, - '[email protected]', - $this->contactID - ); - $this->assertInstanceOf( - 'wmf_communication\ICiviMailQueueRecord', - $queueRecord, - 'addQueueRecord should return an ICiviMailQueueRecord' - ); - $this->assertTrue( - is_numeric( $queueRecord->getQueueID() ), - 'CiviMailQueueRecord should have a numeric ID' - ); - $this->assertEquals( - $this->contactID, - $queueRecord->getContactID(), - 'CiviMailQueueRecord has wrong contact ID' - ); - $this->assertEquals( - $this->emailID, - $queueRecord->getEmailID(), - 'CiviMailQueueRecord has wrong email ID' - ); - } -} ->>>>>>> BRANCH (7e2eed Merge "CiviCRM submodule update - export speed fixes") -- To view, visit https://gerrit.wikimedia.org/r/274627 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I828a9150706dd57ff862c9f972ea122adbf7dec2 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: deployment Gerrit-Owner: Eileen <[email protected]> Gerrit-Reviewer: Awight <[email protected]> Gerrit-Reviewer: Cdentinger <[email protected]> Gerrit-Reviewer: Eileen <[email protected]> Gerrit-Reviewer: Ejegg <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
