jenkins-bot has submitted this change and it was merged.
Change subject: Store new ID to the session when regenerating Order ID
......................................................................
Store new ID to the session when regenerating Order ID
Bug: T120805
Change-Id: I1e91736d60b6419608ce0a5edf21568453488101
---
M gateway_common/gateway.adapter.php
M tests/Adapter/GlobalCollect/GlobalCollectTest.php
2 files changed, 6 insertions(+), 0 deletions(-)
Approvals:
Ejegg: Looks good to me, approved
jenkins-bot: Verified
diff --git a/gateway_common/gateway.adapter.php
b/gateway_common/gateway.adapter.php
index f24aa51..f013038 100644
--- a/gateway_common/gateway.adapter.php
+++ b/gateway_common/gateway.adapter.php
@@ -3850,6 +3850,8 @@
//tell DonationData about it
$this->addRequestData( array ( 'order_id' => $id ) );
+ // Add new Order ID to the session.
+ $this->session_addDonorData();
return $id;
}
diff --git a/tests/Adapter/GlobalCollect/GlobalCollectTest.php
b/tests/Adapter/GlobalCollect/GlobalCollectTest.php
index b8f6d99..69b979d 100644
--- a/tests/Adapter/GlobalCollect/GlobalCollectTest.php
+++ b/tests/Adapter/GlobalCollect/GlobalCollectTest.php
@@ -617,5 +617,9 @@
$result = $gateway->doPayment();
$this->assertEmpty( $result->isFailed(), 'PaymentResult should
not be failed' );
$this->assertEmpty( $result->getErrors(), 'PaymentResult should
have no errors' );
+ $this->assertNotEquals( $gateway->getData_Unstaged_Escaped(
'order_id' ), $orig_id,
+ 'Order ID regenerated in DonationData.' );
+ $this->assertNotEquals( $gateway->session_getData( 'order_id'
), $orig_id,
+ 'Order ID regenerated in session.' );
}
}
--
To view, visit https://gerrit.wikimedia.org/r/257795
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1e91736d60b6419608ce0a5edf21568453488101
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: master
Gerrit-Owner: Awight <[email protected]>
Gerrit-Reviewer: AndyRussG <[email protected]>
Gerrit-Reviewer: Awight <[email protected]>
Gerrit-Reviewer: Cdentinger <[email protected]>
Gerrit-Reviewer: Eileen <[email protected]>
Gerrit-Reviewer: Ejegg <[email protected]>
Gerrit-Reviewer: Katie Horn <[email protected]>
Gerrit-Reviewer: Pcoombe <[email protected]>
Gerrit-Reviewer: Ssmith <[email protected]>
Gerrit-Reviewer: XenoRyet <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits