https://www.mediawiki.org/wiki/Special:Code/MediaWiki/102120
Revision: 102120
Author: jpostlethwaite
Date: 2011-11-05 21:08:19 +0000 (Sat, 05 Nov 2011)
Log Message:
-----------
Fixed Sweden spelling mistake see r100823.
Modified Paths:
--------------
trunk/extensions/DonationInterface/globalcollect_gateway/globalcollect.adapter.php
trunk/extensions/DonationInterface/tests/Adapter/GlobalCollect/AllTests.php
trunk/extensions/DonationInterface/tests/macros/form.twostepamount.realtimebanktransfer.nordea_sweden.htm
Added Paths:
-----------
trunk/extensions/DonationInterface/tests/Adapter/GlobalCollect/RealTimeBankTransferNordeaSwedenTestCase.php
Removed Paths:
-------------
trunk/extensions/DonationInterface/tests/Adapter/GlobalCollect/RealTimeBankTransferNordeaSweedenTestCase.php
Modified:
trunk/extensions/DonationInterface/globalcollect_gateway/globalcollect.adapter.php
===================================================================
---
trunk/extensions/DonationInterface/globalcollect_gateway/globalcollect.adapter.php
2011-11-05 21:06:33 UTC (rev 102119)
+++
trunk/extensions/DonationInterface/globalcollect_gateway/globalcollect.adapter.php
2011-11-05 21:08:19 UTC (rev 102120)
@@ -390,7 +390,7 @@
// Real Time Bank Transfers
$this->payment_methods['rtbt'] = array(
'label' => 'Real time bank transfer',
- 'types' => array( 'rtbt_ideal', 'rtbt_eps',
'rtbt_sofortuberweisung', 'rtbt_nordea_sweeden', 'rtbt_enets', ),
+ 'types' => array( 'rtbt_ideal', 'rtbt_eps',
'rtbt_sofortuberweisung', 'rtbt_nordea_sweden', 'rtbt_enets', ),
);
}
@@ -598,10 +598,10 @@
* Real time bank transfers
*/
- // Nordea (Sweeden)
- $this->payment_submethods['rtbt_nordea_sweeden'] = array(
+ // Nordea (Sweden)
+ $this->payment_submethods['rtbt_nordea_sweden'] = array(
'paymentproductid' => 805,
- 'label' => 'Nordea (Sweeden)',
+ 'label' => 'Nordea (Sweden)',
'group' => 'rtbt',
'validation' => array(),
);
@@ -1209,7 +1209,7 @@
break;
/* Real time bank transfer */
- case 'rtbt_nordea_sweeden':
+ case 'rtbt_nordea_sweden':
case 'rtbt_enets':
case 'rtbt_sofortuberweisung':
$this->staged_data['payment_product'] =
$this->payment_submethods[ $payment_submethod ]['paymentproductid'];
Modified:
trunk/extensions/DonationInterface/tests/Adapter/GlobalCollect/AllTests.php
===================================================================
--- trunk/extensions/DonationInterface/tests/Adapter/GlobalCollect/AllTests.php
2011-11-05 21:06:33 UTC (rev 102119)
+++ trunk/extensions/DonationInterface/tests/Adapter/GlobalCollect/AllTests.php
2011-11-05 21:08:19 UTC (rev 102120)
@@ -45,9 +45,9 @@
require_once dirname( __FILE__ ) . DIRECTORY_SEPARATOR .
'RealTimeBankTransferIdealTestCase.php';
/**
- * @see
DonationInterface_Adapter_GlobalCollect_RealTimeBankTransferNordeaSweedenTestCase
+ * @see
DonationInterface_Adapter_GlobalCollect_RealTimeBankTransferNordeaSwedenTestCase
*/
-require_once dirname( __FILE__ ) . DIRECTORY_SEPARATOR .
'RealTimeBankTransferNordeaSweedenTestCase.php';
+require_once dirname( __FILE__ ) . DIRECTORY_SEPARATOR .
'RealTimeBankTransferNordeaSwedenTestCase.php';
/**
* @see
DonationInterface_Adapter_GlobalCollect_RealTimeBankTransferSofortuberweisungTestCase
@@ -99,8 +99,8 @@
// Ideal
$suite->addTestSuite(
'DonationInterface_Adapter_GlobalCollect_RealTimeBankTransferIdealTestCase' );
- // Nordea (Sweeden)
- $suite->addTestSuite(
'DonationInterface_Adapter_GlobalCollect_RealTimeBankTransferNordeaSweedenTestCase'
);
+ // Nordea (Sweden)
+ $suite->addTestSuite(
'DonationInterface_Adapter_GlobalCollect_RealTimeBankTransferNordeaSwedenTestCase'
);
// eNETS
$suite->addTestSuite(
'DonationInterface_Adapter_GlobalCollect_RealTimeBankTransferSofortuberweisungTestCase'
);
Copied:
trunk/extensions/DonationInterface/tests/Adapter/GlobalCollect/RealTimeBankTransferNordeaSwedenTestCase.php
(from rev 102117,
trunk/extensions/DonationInterface/tests/Adapter/GlobalCollect/RealTimeBankTransferNordeaSweedenTestCase.php)
===================================================================
---
trunk/extensions/DonationInterface/tests/Adapter/GlobalCollect/RealTimeBankTransferNordeaSwedenTestCase.php
(rev 0)
+++
trunk/extensions/DonationInterface/tests/Adapter/GlobalCollect/RealTimeBankTransferNordeaSwedenTestCase.php
2011-11-05 21:08:19 UTC (rev 102120)
@@ -0,0 +1,58 @@
+<?php
+/**
+ * Wikimedia Foundation
+ *
+ * LICENSE
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * @since r100823
+ * @author Jeremy Postlethwaite <[email protected]>
+ */
+
+/**
+ * @see DonationInterfaceTestCase
+ */
+require_once dirname( dirname( dirname( __FILE__ ) ) ) . DIRECTORY_SEPARATOR .
'DonationInterfaceTestCase.php';
+
+/**
+ *
+ * @group Fundraising
+ * @group Gateways
+ * @group DonationInterface
+ * @group GlobalCollect
+ * @group RealTimeBankTransfer
+ */
+class
DonationInterface_Adapter_GlobalCollect_RealTimeBankTransferNordeaSwedenTestCase
extends DonationInterfaceTestCase {
+
+ /**
+ * testBuildRequestXml
+ *
+ * @covers GatewayAdapter::__construct
+ * @covers GatewayAdapter::setCurrentTransaction
+ * @covers GatewayAdapter::buildRequestXML
+ * @covers GatewayAdapter::getData
+ */
+ public function testBuildRequestXml() {
+
+ $optionsForTestData = array(
+ 'form_name' => 'TwoStepAmount',
+ 'payment_method' => 'rtbt',
+ 'payment_submethod' => 'rtbt_nordea_sweden',
+ 'payment_product_id' => 805,
+ );
+
+ $options = $this->getGatewayAdapterTestDataFromSpain(
$optionsForTestData );
+
+ $this->buildRequestXmlForGlobalCollect( $optionsForTestData,
$options );
+ }
+}
+
Deleted:
trunk/extensions/DonationInterface/tests/Adapter/GlobalCollect/RealTimeBankTransferNordeaSweedenTestCase.php
===================================================================
---
trunk/extensions/DonationInterface/tests/Adapter/GlobalCollect/RealTimeBankTransferNordeaSweedenTestCase.php
2011-11-05 21:06:33 UTC (rev 102119)
+++
trunk/extensions/DonationInterface/tests/Adapter/GlobalCollect/RealTimeBankTransferNordeaSweedenTestCase.php
2011-11-05 21:08:19 UTC (rev 102120)
@@ -1,58 +0,0 @@
-<?php
-/**
- * Wikimedia Foundation
- *
- * LICENSE
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * @since r100823
- * @author Jeremy Postlethwaite <[email protected]>
- */
-
-/**
- * @see DonationInterfaceTestCase
- */
-require_once dirname( dirname( dirname( __FILE__ ) ) ) . DIRECTORY_SEPARATOR .
'DonationInterfaceTestCase.php';
-
-/**
- *
- * @group Fundraising
- * @group Gateways
- * @group DonationInterface
- * @group GlobalCollect
- * @group RealTimeBankTransfer
- */
-class
DonationInterface_Adapter_GlobalCollect_RealTimeBankTransferNordeaSweedenTestCase
extends DonationInterfaceTestCase {
-
- /**
- * testBuildRequestXml
- *
- * @covers GatewayAdapter::__construct
- * @covers GatewayAdapter::setCurrentTransaction
- * @covers GatewayAdapter::buildRequestXML
- * @covers GatewayAdapter::getData
- */
- public function testBuildRequestXml() {
-
- $optionsForTestData = array(
- 'form_name' => 'TwoStepAmount',
- 'payment_method' => 'rtbt',
- 'payment_submethod' => 'rtbt_nordea_sweeden',
- 'payment_product_id' => 805,
- );
-
- $options = $this->getGatewayAdapterTestDataFromSpain(
$optionsForTestData );
-
- $this->buildRequestXmlForGlobalCollect( $optionsForTestData,
$options );
- }
-}
-
Modified:
trunk/extensions/DonationInterface/tests/macros/form.twostepamount.realtimebanktransfer.nordea_sweden.htm
===================================================================
---
trunk/extensions/DonationInterface/tests/macros/form.twostepamount.realtimebanktransfer.nordea_sweden.htm
2011-11-05 21:06:33 UTC (rev 102119)
+++
trunk/extensions/DonationInterface/tests/macros/form.twostepamount.realtimebanktransfer.nordea_sweden.htm
2011-11-05 21:08:19 UTC (rev 102120)
@@ -13,7 +13,7 @@
</thead><tbody>
<tr>
<td>open</td>
-
<td>/index.php/Special:GlobalCollectGateway?form_name=TwoStepAmount&payment_method=rtbt&payment_submethod=rtbt_nordea_sweeden</td>
+
<td>/index.php/Special:GlobalCollectGateway?form_name=TwoStepAmount&payment_method=rtbt&payment_submethod=rtbt_nordea_sweden</td>
<td></td>
</tr>
<tr>
@@ -29,7 +29,7 @@
<tr>
<td>select</td>
<td>id=country</td>
- <td>label=Netherlands</td>
+ <td>label=Sweden</td>
</tr>
<tr>
<td>type</td>
@@ -48,15 +48,20 @@
</tr>
<tr>
<td>click</td>
- <td>//input[@name='amountRadio' and @value='250']</td>
+ <td>//input[@name='amountRadio' and @value='10']</td>
<td></td>
</tr>
<tr>
<td>click</td>
- <td>//table[@id='amount-radio']/tbody/tr[2]/td[3]/label</td>
+ <td>//table[@id='amount-radio']/tbody/tr/td[2]/label</td>
<td></td>
</tr>
<tr>
+ <td>select</td>
+ <td>id=input_currency_code</td>
+ <td>label=Swedish krona</td>
+</tr>
+<tr>
<td>clickAndWait</td>
<td>css=input.button-plain</td>
<td></td>
@@ -66,11 +71,6 @@
<td>css=p.payment_error_message.payment_error_message_general</td>
<td>There was an error processing your transaction. Please try again
later.</td>
</tr>
-<tr>
- <td>select</td>
- <td>id=input_currency_code</td>
- <td>label=EUR: Euro</td>
-</tr>
</tbody></table>
</body>
</html>
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
