Ejegg has submitted this change and it was merged.
Change subject: Merge branch 'master' into deployment
......................................................................
Merge branch 'master' into deployment
b103be3 Fix wmf_donor hook when editing contributions
9ed4a5b Fix Silverpop import test
Change-Id: Id1d9217e87e9e9132d9b292c81901bfc75184c59
---
D sites/all/modules/wmf_communication/tests/phpunit/SilverpopImporterTest.php
1 file changed, 0 insertions(+), 134 deletions(-)
Approvals:
Ejegg: Looks good to me, approved
jenkins-bot: Verified
diff --git
a/sites/all/modules/wmf_communication/tests/phpunit/SilverpopImporterTest.php
b/sites/all/modules/wmf_communication/tests/phpunit/SilverpopImporterTest.php
deleted file mode 100644
index 92a8a04..0000000
---
a/sites/all/modules/wmf_communication/tests/phpunit/SilverpopImporterTest.php
+++ /dev/null
@@ -1,134 +0,0 @@
-<<<<<<< HEAD (d0a512 Merge branch 'master' into deployment)
-=======
-<?php
-namespace wmf_communication;
-use \BaseWmfDrupalPhpUnitTestCase;
-
-class SilverpopImporterTest extends BaseWmfDrupalPhpUnitTestCase {
- function testImport() {
- $sftp = $this->getMockBuilder( 'Net_SFTP' )
- ->disableOriginalConstructor()
- ->setMethods( array( 'login', 'get', 'disconnect' ) )
- ->getMock();
- $mailStore = $this->getMock( 'CiviMailBulkStore', array(
'getMailing', 'addMailing', 'addSentBulk' ) );
- $zipper = $this->getMock( 'ZipArchive', array( 'open',
'extractTo' ) );
- $mailing = $this->getMock( 'ICiviMailingRecord', array(
'getMailingName' ) );
-
- $tempDir = file_directory_temp();
-
- $sftp->expects( $this->atLeastOnce() )
- ->method( 'login' )
- ->with( 'TestUser', 'TestPass' )
- ->will( $this->returnValue( true ) );
-
- $sftp->expects( $this->once() )
- ->method( 'get' )
- ->with( 'download/Raw Recipient Data Export Sep 02 2014
18-45-05 PM 1200.zip',
- "$tempDir/Raw Recipient Data Export Sep
02 2014 18-45-05 PM 1200.zip" )
- ->will( $this->returnValue( true ) );
-
- $zipper->expects( $this->once() )
- ->method( 'open' )
- ->with( "$tempDir/Raw Recipient Data Export Sep 02 2014
18-45-05 PM 1200.zip" )
- ->will( $this->returnValue( true ) );
-
- $zipper->expects( $this->once() )
- ->method( 'extractTo' )
- ->with( $tempDir )
- ->will( $this->returnValue( true ) );
-
- $mailStore->expects( $this->once() )
- ->method( 'getMailing' )
- ->with( 'Silverpop', '9876543' )
- ->will( $this->ThrowException( new
CiviMailingMissingException() ) );
-
- $mailStore->expects( $this->once() )
- ->method( 'addMailing' )
- ->with( 'Silverpop', '9876543', $this->anything(),
'Test Subject', 0, 'RUNNING' )
- ->will( $this->returnValue( $mailing ) );
-
- $emails = array();
- $fileContents = "Recipient Id,Recipient Type,Mailing Id,Report
Id,Campaign Id,Email,Event Type,Event Timestamp,Body Type,Content Id,Click
Name,URL,Conversion Action,Conversion Detail,Conversion Amount,Suppression
Reason,,\n";
- for( $i = 0; $i < 10; $i++ ) {
- $email = "[email protected]";
- $emails[] = $email;
- $fileContents .= mt_rand();
- $fileContents .= ',Normal,9876543,503612902,"",';
- $fileContents .= $email;
- $fileContents .= ',Sent,08/29/2014
12:00:08,"","","","","","","","","",""';
- $fileContents .= "\n";
- }
- //add a suppressed record to the end to see that we don't
insert it along with the sent
- $fileContents .=
'105817151078,Normal,9876543,503612902,"",[email protected],Suppressed,08/29/2014
12:00:08,"","","","","","","",Organization Suppression List,"",""' . "\n";
- // Writing a real file since we're not mocking CsvBatchFile
- file_put_contents( "$tempDir/Raw Recipient Data Export Sep 02
2014 18-45-05 PM 1200.csv", $fileContents );
-
- $mailStore->expects( $this->once() )
- ->method( 'addSentBulk' )
- ->with( $mailing, $emails );
-
- $options = array(
- 'engage' => new FakeEngage(),
- 'username' => 'TestUser',
- 'password' => 'TestPass',
- 'sftp' => $sftp,
- 'civimailstore' => $mailStore,
- 'zipper' => $zipper,
- );
-
- $silverpopImporter = new SilverpopImporter( $options );
-
- $silverpopImporter->import( 1 );
-
- //TODO: assert some things about $engage->executeArgs;
- }
-}
-
-class FakeEngage {
- public $executeResponses = array(
- 'GetSentMailingsForOrg' => '<Mailing>
-<MailingId>9876543</MailingId>
-<ReportId>135791113</ReportId>
-<ScheduledTS>2014-09-02 13:24:23.0</ScheduledTS>
-<MailingName><![CDATA[Test Mailing]]></MailingName>
-<ListName><![CDATA[Test List]]></ListName>
-<ListId>1234567</ListId>
-<UserName>Mailing Sender</UserName>
-<SentTS>2014-09-02 13:25:12.0</SentTS>
-<NumSent>3</NumSent>
-<Subject><![CDATA[Test Subject]]></Subject>
-<Visibility>Shared</Visibility>
-</Mailing>',
- 'RawRecipientDataExport' => '<MAILING>
-<JOB_ID>77665544</JOB_ID>
-<FILE_PATH>Raw Recipient Data Export Sep 02 2014 18-45-05 PM
1200.zip</FILE_PATH>
-</MAILING>',
- 'GetJobStatus' => '<JOB_ID>77665544</JOB_ID>
-<JOB_STATUS>COMPLETE</JOB_STATUS>
-<JOB_DESCRIPTION>Export raw recipient data.</JOB_DESCRIPTION>
-<PARAMETERS>
-</PARAMETERS>'
- );
-
- public function login() {
- return true;
- }
-
- public $executeArgs = array();
- /**
- * @param SimpleXMLElement $simplexml
- */
- public function execute( $simplexml ) {
- $kids = $simplexml->Body->children();
- $nodeName = $kids[0]->getName();
- $this->executeArgs[$nodeName] = $simplexml;
- return simplexml_load_string("<Body>
-<RESULT>
-<SUCCESS>TRUE</SUCCESS>
-" . $this->executeResponses[$nodeName] . "
-</RESULT>
-</Body>
-");
- }
-}
->>>>>>> BRANCH (b103be Fix wmf_donor hook when editing contributions)
--
To view, visit https://gerrit.wikimedia.org/r/176152
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id1d9217e87e9e9132d9b292c81901bfc75184c59
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg <[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
