[MediaWiki-commits] [Gerrit] Reset adapter account config in test setup - change (mediawiki...DonationInterface)

2015-11-23 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Reset adapter account config in test setup
..


Reset adapter account config in test setup

Hadn't been resetting account config for some gateways, leading to
tests using LocalSettings configuration instead of config from
TestConfiguration.php.  Also moves Amazon test config to that file.

Change-Id: I589d17c51acbaaa47dfb34c78c9074a4c1b49d7b
---
M tests/Adapter/Amazon/AmazonTest.php
M tests/TestConfiguration.php
2 files changed, 13 insertions(+), 15 deletions(-)

Approvals:
  Awight: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/tests/Adapter/Amazon/AmazonTest.php 
b/tests/Adapter/Amazon/AmazonTest.php
index 3e439a0..d60084b 100644
--- a/tests/Adapter/Amazon/AmazonTest.php
+++ b/tests/Adapter/Amazon/AmazonTest.php
@@ -53,16 +53,6 @@
'recurring',
),
),
-   'wgAmazonGatewayAccountInfo' => array( 'test' => array(
-   'SellerID' => 'ABCDEFGHIJKL',
-   'ClientID' => 
'amzn1.application-oa2-client.1a2b3c4d5e',
-   'ClientSecret' => 
'12432g134e3421a41234b1341c324123d',
-   'MWSAccessKey' => 'N0NSENSEXYZ',
-   'MWSSecretKey' => 
'iuasd/2jhaslk2j49lkaALksdJLsJLas+',
-   'Region' => 'us',
-   'WidgetScriptURL' => 
'https://static-na.payments-amazon.com/OffAmazonPayments/us/sandbox/js/Widgets.js',
-   'ReturnURL' => 
"https://example.org/index.php/Special:AmazonGateway?debug=true;,
-   ) ),
) );
}
 
diff --git a/tests/TestConfiguration.php b/tests/TestConfiguration.php
index b35945d..fb7c288 100644
--- a/tests/TestConfiguration.php
+++ b/tests/TestConfiguration.php
@@ -99,7 +99,7 @@
 
 
 /** Paypal **/
-$wgPaypalGatewayAccountInfo = array ( );
+$wgPaypalGatewayAccountInfo = array ();
 $wgPaypalGatewayAccountInfo['testing'] = array (
'AccountEmail' => 'phpunittest...@wikimedia.org',
 );
@@ -108,15 +108,21 @@
 
 /** Amazon **/
 $wgAmazonGatewayReturnURL = 
'https://payments.wikimedia.org/index.php/Special:AmazonGateway';
+$wgAmazonGatewayAccountInfo = array();
 $wgAmazonGatewayAccountInfo['test'] = array (
-   'AccessKey' => 'testkey',
-   'SecretKey' => 'testsecret',
-   'PaymentsAccountID' => 'testaccountid',
-   'IpnOverride' => 'https://test.wikimedia.org/amazon',
+   'SellerID' => 'ABCDEFGHIJKL',
+   'ClientID' => 'amzn1.application-oa2-client.1a2b3c4d5e',
+   'ClientSecret' => '12432g134e3421a41234b1341c324123d',
+   'MWSAccessKey' => 'N0NSENSEXYZ',
+   'MWSSecretKey' => 'iuasd/2jhaslk2j49lkaALksdJLsJLas+',
+   'Region' => 'us',
+   'WidgetScriptURL' => 
'https://static-na.payments-amazon.com/OffAmazonPayments/us/sandbox/js/Widgets.js',
+   'ReturnURL' => 
"https://example.org/index.php/Special:AmazonGateway?debug=true;,
 );
 
 /** Adyen **/
 $wgAdyenGatewayBaseURL = 'https://testorwhatever.adyen.com';
+$wgAdyenGatewayAccountInfo = array();
 $wgAdyenGatewayAccountInfo['test'] = array (
'AccountName' => 'wikitest',
'SharedSecret' => 'long-cat-is-long',
@@ -126,6 +132,7 @@
 /** Astropay **/
 $wgAstropayGatewayURL = 'https://astropay.example.com/';
 $wgAstropayGatewayTestingURL = 'https://sandbox.astropay.example.com/';
+$wgAstropayGatewayAccountInfo = array();
 $wgAstropayGatewayAccountInfo['test'] = array (
'Create' => array(
'Login' => 'createlogin',
@@ -138,6 +145,7 @@
'SecretKey' => 'NanananananananananananananananaBatman',
 );
 
+$wgWorldpayGatewayAccountInfo = array();
 /** Worldpay **/
 $wgWorldpayGatewayAccountInfo['test'] = array (
'Username' => 'testname',

-- 
To view, visit https://gerrit.wikimedia.org/r/248924
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I589d17c51acbaaa47dfb34c78c9074a4c1b49d7b
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: master
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: AndyRussG 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: Cdentinger 
Gerrit-Reviewer: Ssmith 
Gerrit-Reviewer: XenoRyet 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Reset adapter account config in test setup - change (mediawiki...DonationInterface)

2015-10-26 Thread Ejegg (Code Review) 
Ejegg has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/248924

Change subject: Reset adapter account config in test setup
..

Reset adapter account config in test setup

Hadn't been resetting account config for some gateways, leading to
tests using LocalSettings configuration instead of config from
TestConfiguration.php.  Also moves Amazon test config to that file.

Change-Id: I589d17c51acbaaa47dfb34c78c9074a4c1b49d7b
---
M tests/Adapter/Amazon/AmazonTest.php
M tests/TestConfiguration.php
2 files changed, 13 insertions(+), 15 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DonationInterface 
refs/changes/24/248924/1

diff --git a/tests/Adapter/Amazon/AmazonTest.php 
b/tests/Adapter/Amazon/AmazonTest.php
index 3e439a0..d60084b 100644
--- a/tests/Adapter/Amazon/AmazonTest.php
+++ b/tests/Adapter/Amazon/AmazonTest.php
@@ -53,16 +53,6 @@
'recurring',
),
),
-   'wgAmazonGatewayAccountInfo' => array( 'test' => array(
-   'SellerID' => 'ABCDEFGHIJKL',
-   'ClientID' => 
'amzn1.application-oa2-client.1a2b3c4d5e',
-   'ClientSecret' => 
'12432g134e3421a41234b1341c324123d',
-   'MWSAccessKey' => 'N0NSENSEXYZ',
-   'MWSSecretKey' => 
'iuasd/2jhaslk2j49lkaALksdJLsJLas+',
-   'Region' => 'us',
-   'WidgetScriptURL' => 
'https://static-na.payments-amazon.com/OffAmazonPayments/us/sandbox/js/Widgets.js',
-   'ReturnURL' => 
"https://example.org/index.php/Special:AmazonGateway?debug=true;,
-   ) ),
) );
}
 
diff --git a/tests/TestConfiguration.php b/tests/TestConfiguration.php
index b35945d..fb7c288 100644
--- a/tests/TestConfiguration.php
+++ b/tests/TestConfiguration.php
@@ -99,7 +99,7 @@
 
 
 /** Paypal **/
-$wgPaypalGatewayAccountInfo = array ( );
+$wgPaypalGatewayAccountInfo = array ();
 $wgPaypalGatewayAccountInfo['testing'] = array (
'AccountEmail' => 'phpunittest...@wikimedia.org',
 );
@@ -108,15 +108,21 @@
 
 /** Amazon **/
 $wgAmazonGatewayReturnURL = 
'https://payments.wikimedia.org/index.php/Special:AmazonGateway';
+$wgAmazonGatewayAccountInfo = array();
 $wgAmazonGatewayAccountInfo['test'] = array (
-   'AccessKey' => 'testkey',
-   'SecretKey' => 'testsecret',
-   'PaymentsAccountID' => 'testaccountid',
-   'IpnOverride' => 'https://test.wikimedia.org/amazon',
+   'SellerID' => 'ABCDEFGHIJKL',
+   'ClientID' => 'amzn1.application-oa2-client.1a2b3c4d5e',
+   'ClientSecret' => '12432g134e3421a41234b1341c324123d',
+   'MWSAccessKey' => 'N0NSENSEXYZ',
+   'MWSSecretKey' => 'iuasd/2jhaslk2j49lkaALksdJLsJLas+',
+   'Region' => 'us',
+   'WidgetScriptURL' => 
'https://static-na.payments-amazon.com/OffAmazonPayments/us/sandbox/js/Widgets.js',
+   'ReturnURL' => 
"https://example.org/index.php/Special:AmazonGateway?debug=true;,
 );
 
 /** Adyen **/
 $wgAdyenGatewayBaseURL = 'https://testorwhatever.adyen.com';
+$wgAdyenGatewayAccountInfo = array();
 $wgAdyenGatewayAccountInfo['test'] = array (
'AccountName' => 'wikitest',
'SharedSecret' => 'long-cat-is-long',
@@ -126,6 +132,7 @@
 /** Astropay **/
 $wgAstropayGatewayURL = 'https://astropay.example.com/';
 $wgAstropayGatewayTestingURL = 'https://sandbox.astropay.example.com/';
+$wgAstropayGatewayAccountInfo = array();
 $wgAstropayGatewayAccountInfo['test'] = array (
'Create' => array(
'Login' => 'createlogin',
@@ -138,6 +145,7 @@
'SecretKey' => 'NanananananananananananananananaBatman',
 );
 
+$wgWorldpayGatewayAccountInfo = array();
 /** Worldpay **/
 $wgWorldpayGatewayAccountInfo['test'] = array (
'Username' => 'testname',

-- 
To view, visit https://gerrit.wikimedia.org/r/248924
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I589d17c51acbaaa47dfb34c78c9074a4c1b49d7b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: master
Gerrit-Owner: Ejegg 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits