jenkins-bot has submitted this change and it was merged.
Change subject: Merge branch 'master' into deployment
......................................................................
Merge branch 'master' into deployment
bcb1e40 DRY finding OrderReferenceId, get_class() -> instanceOf
86d27c4 closeOrderReference errors don't blow up
cb7e31b Fix Amazon order IDs for manual captures
Change-Id: If3fde1ab75e359f92be8f0c7467126ee51d7a632
---
D PaymentProviders/Amazon/Tests/Data/responses/getOrderReferenceDetails.json
D PaymentProviders/Amazon/Tests/phpunit/ApiTest.php
2 files changed, 0 insertions(+), 57 deletions(-)
Approvals:
Ejegg: Looks good to me, approved
jenkins-bot: Verified
diff --git
a/PaymentProviders/Amazon/Tests/Data/responses/getOrderReferenceDetails.json
b/PaymentProviders/Amazon/Tests/Data/responses/getOrderReferenceDetails.json
deleted file mode 100644
index 407a227..0000000
--- a/PaymentProviders/Amazon/Tests/Data/responses/getOrderReferenceDetails.json
+++ /dev/null
@@ -1,40 +0,0 @@
-<<<<<<< HEAD (cac1a1 Merge branch 'master' into deployment)
-=======
-{
- "GetOrderReferenceDetailsResult": {
- "OrderReferenceDetails": {
- "OrderReferenceStatus": {
- "LastUpdateTimestamp": "2015-09-28T17:49:08.123Z",
- "ReasonCode": "SellerClosed",
- "State": "Closed"
- },
- "ExpirationTimestamp": "2016-03-27T17:48:23.249Z",
- "IdList": {
- "member": [
- "P01-0133129-0199515-A068790",
- "P01-0133129-0199515-A019658"
- ]
- },
- "SellerOrderAttributes": {
- "SellerOrderId": "123456789-0"
- },
- "OrderTotal": {
- "CurrencyCode": "USD",
- "Amount": "10.00"
- },
- "Buyer": {
- "Name": "Testy Test",
- "Email": "nob...@wikimedia.org"
- },
- "ReleaseEnvironment": "Sandbox",
- "SellerNote": "Donation to the Wikimedia Foundation",
- "AmazonOrderReferenceId": "P01-0133129-0199515",
- "CreationTimestamp": "2015-09-28T17:48:23.123Z"
- }
- },
- "ResponseMetadata": {
- "RequestId": "896332ae-e316-4eb6-865e-79278e1aa214"
- },
- "ResponseStatus": "200"
-}
->>>>>>> BRANCH (62e99a Merge "closeOrderReference errors don't blow up")
diff --git a/PaymentProviders/Amazon/Tests/phpunit/ApiTest.php
b/PaymentProviders/Amazon/Tests/phpunit/ApiTest.php
deleted file mode 100644
index 74f1b81..0000000
--- a/PaymentProviders/Amazon/Tests/phpunit/ApiTest.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<<<<<<< HEAD (cac1a1 Merge branch 'master' into deployment)
-=======
-<?php
-namespace SmashPig\PaymentProviders\Amazon\Tests;
-
-use SmashPig\PaymentProviders\Amazon\AmazonApi;
-
-class ApiTest extends AmazonTestCase {
-
- public function testFindParent() {
- $this->mockClient->returns['getAuthorizationDetails'][] =
'Declined';
- $this->mockClient->returns['getAuthorizationDetails'][] =
'Closed';
- $parentId = AmazonApi::get()->findCaptureId(
'P01-0133129-0199515' );
- $this->assertEquals( 'P01-0133129-0199515-C019658', $parentId,
'Did not get the right refund parent ID' );
- }
-}
->>>>>>> BRANCH (62e99a Merge "closeOrderReference errors don't blow up")
--
To view, visit https://gerrit.wikimedia.org/r/322196
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If3fde1ab75e359f92be8f0c7467126ee51d7a632
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/SmashPig
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg <eeggles...@wikimedia.org>
Gerrit-Reviewer: Ejegg <eeggles...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
