jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/339489 )
Change subject: Update SmashPig library ...................................................................... Update SmashPig library Get some Ingenico error handling. Needed to tweak test mock to not call original constructor. Bug: T128692 Change-Id: Ica848b6dcec3ce215d0e76b95d403cea6a4bce01 --- M composer.lock M tests/phpunit/Adapter/GlobalCollect/RealTimeBankTransferIdealTest.php 2 files changed, 6 insertions(+), 3 deletions(-) Approvals: jenkins-bot: Verified Awight: Looks good to me, approved diff --git a/composer.lock b/composer.lock index c941554..bcc8efa 100644 --- a/composer.lock +++ b/composer.lock @@ -936,7 +936,7 @@ "source": { "type": "git", "url": "https://gerrit.wikimedia.org/r/wikimedia/fundraising/SmashPig.git", - "reference": "d581a349e42a73ea7bf3166506262a7fb582b9e6" + "reference": "4625e68bd0fde15a2dc3ff646cc01bcd4325d8fc" }, "require": { "amzn/login-and-pay-with-amazon-sdk-php": "dev-master", @@ -987,7 +987,7 @@ "donations", "payments" ], - "time": "2017-02-17 00:27:55" + "time": "2017-02-23 20:48:06" }, { "name": "zordius/lightncandy", diff --git a/tests/phpunit/Adapter/GlobalCollect/RealTimeBankTransferIdealTest.php b/tests/phpunit/Adapter/GlobalCollect/RealTimeBankTransferIdealTest.php index bdd530a..b949f86 100644 --- a/tests/phpunit/Adapter/GlobalCollect/RealTimeBankTransferIdealTest.php +++ b/tests/phpunit/Adapter/GlobalCollect/RealTimeBankTransferIdealTest.php @@ -37,7 +37,10 @@ $config = Configuration::createForView( 'ingenico' ); Context::initWithLogger( $config ); // gets torn down in parent - $this->bankPaymentProvider = $this->getMock( '\SmashPig\PaymentProviders\Ingenico\BankPaymentProvider' ); + $this->bankPaymentProvider = $this->getMockBuilder( + '\SmashPig\PaymentProviders\Ingenico\BankPaymentProvider' + )->disableOriginalConstructor()->getMock(); + $config->overrideObjectInstance( 'payment-provider/rtbt', $this->bankPaymentProvider ); $this->bankPaymentProvider->method( 'getBankList' ) -- To view, visit https://gerrit.wikimedia.org/r/339489 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ica848b6dcec3ce215d0e76b95d403cea6a4bce01 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/DonationInterface Gerrit-Branch: master Gerrit-Owner: Ejegg <eeggles...@wikimedia.org> Gerrit-Reviewer: AndyRussG <andrew.green...@gmail.com> Gerrit-Reviewer: Awight <awi...@wikimedia.org> Gerrit-Reviewer: Cdentinger <cdentin...@wikimedia.org> Gerrit-Reviewer: Eileen <emcnaugh...@wikimedia.org> Gerrit-Reviewer: Ejegg <eeggles...@wikimedia.org> Gerrit-Reviewer: Katie Horn <kh...@wikimedia.org> Gerrit-Reviewer: Ssmith <ssm...@wikimedia.org> Gerrit-Reviewer: XenoRyet <dkozlow...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits