jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/401537 )
Change subject: Merge branch 'master' into deployment
......................................................................
Merge branch 'master' into deployment
a5ec53c On exception, increase count and log error
b5007fe Demote error to warning, change WS
1f497b1 Pass proxy parameters to Amazon SDK
da16e51 Update phpunit in composer.lock
593f434 Updated behaviour when queue is populated from dump file to detect
whether additional info source headers are present and if not inject them
268799f Use XMLReader for WX audit
a99f36b Amazon: automatic retry on TransactionTimedOut
Change-Id: If27122250e9eed55bbd2b5806bf00df8ed77c64f
---
D PaymentProviders/Amazon/Tests/phpunit/ActionsTest.php
1 file changed, 0 insertions(+), 61 deletions(-)
Approvals:
Jgleeson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/PaymentProviders/Amazon/Tests/phpunit/ActionsTest.php
b/PaymentProviders/Amazon/Tests/phpunit/ActionsTest.php
deleted file mode 100644
index 3e30e7b..0000000
--- a/PaymentProviders/Amazon/Tests/phpunit/ActionsTest.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<<<<<<< HEAD (45aa62 Update vendor for .htaccess)
-=======
-<?php
-namespace SmashPig\PaymentProviders\Amazon\Tests;
-
-use SmashPig\PaymentProviders\Amazon\Actions\ReconstructMerchantReference;
-use SmashPig\PaymentProviders\Amazon\Actions\RetryAuthorization;
-use SmashPig\PaymentProviders\Amazon\ExpatriatedMessages\AuthorizationDeclined;
-use SmashPig\PaymentProviders\Amazon\ExpatriatedMessages\CaptureCompleted;
-
-class ActionsTest extends AmazonTestCase {
-
- public function testReconstructMerchantId() {
- $captureCompleted = $this->loadJson( __DIR__ .
"/../Data/IPN/CaptureCompleted.json" );
- $captureCompleted["CaptureDetails"]["CaptureReferenceId"] =
'AUTHORIZE_123456767';
- $message = new CaptureCompleted( $captureCompleted );
- $this->assertEquals( 'AUTHORIZE_123456767',
$message->getOrderId() );
- $action = new ReconstructMerchantReference();
- $action->execute( $message );
- // This ID comes from getOrderReferenceDetails.json
- $this->assertEquals( '123456789-0', $message->getOrderId() );
- }
-
- /**
- * Don't waste API calls when it's not an AUTHORIZE_ id
- */
- public function testReconstructMerchantIdNotNeeded() {
- $captureCompleted = $this->loadJson( __DIR__ .
"/../Data/IPN/CaptureCompleted.json" );
- $message = new CaptureCompleted( $captureCompleted );
- $action = new ReconstructMerchantReference();
- $action->execute( $message );
- $this->assertEquals( '98765432-1', $message->getOrderId() );
- $this->assertEmpty( $this->mockClient->calls );
- }
-
- /**
- * Retry auths declined because TransactionTimedOut
- */
- public function testRetryAuthorizationTimedOut() {
- $authDeclined = $this->loadJson( __DIR__ .
"/../Data/IPN/AuthorizationDeclined.json" );
- $message = new AuthorizationDeclined( $authDeclined );
- $action = new RetryAuthorization();
- $action->execute( $message );
- $this->assertArrayHasKey( 'authorize', $this->mockClient->calls
);
- $params = $this->mockClient->calls['authorize'][0];
- $originalDetails = $authDeclined['AuthorizationDetails'];
- $this->assertEquals(
- $originalDetails['AuthorizationAmount']['Amount'],
- $params['authorization_amount']
- );
- $this->assertEquals(
- $originalDetails['AuthorizationReferenceId'],
- $params['authorization_reference_id']
- );
- $this->assertEquals(
- $message->getOrderReferenceId(),
- $params['amazon_order_reference_id']
- );
- }
-}
->>>>>>> BRANCH (a99f36 Amazon: automatic retry on TransactionTimedOut)
--
To view, visit https://gerrit.wikimedia.org/r/401537
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If27122250e9eed55bbd2b5806bf00df8ed77c64f
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/SmashPig
Gerrit-Branch: deployment
Gerrit-Owner: Jgleeson <[email protected]>
Gerrit-Reviewer: Ejegg <[email protected]>
Gerrit-Reviewer: Jgleeson <[email protected]>
Gerrit-Reviewer: Mepps <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
