| Index: trunk/extensions/DonationInterface/globalcollect_gateway/globalcollect.adapter.php |
| — | — | @@ -390,7 +390,7 @@ |
| 391 | 391 | // Real Time Bank Transfers |
| 392 | 392 | $this->payment_methods['rtbt'] = array( |
| 393 | 393 | 'label' => 'Real time bank transfer', |
| 394 | | - 'types' => array( 'rtbt_ideal', 'rtbt_eps', 'rtbt_sofortuberweisung', 'rtbt_nordea_sweeden', 'rtbt_enets', ), |
| | 394 | + 'types' => array( 'rtbt_ideal', 'rtbt_eps', 'rtbt_sofortuberweisung', 'rtbt_nordea_sweden', 'rtbt_enets', ), |
| 395 | 395 | ); |
| 396 | 396 | } |
| 397 | 397 | |
| — | — | @@ -598,10 +598,10 @@ |
| 599 | 599 | * Real time bank transfers |
| 600 | 600 | */ |
| 601 | 601 | |
| 602 | | - // Nordea (Sweeden) |
| 603 | | - $this->payment_submethods['rtbt_nordea_sweeden'] = array( |
| | 602 | + // Nordea (Sweden) |
| | 603 | + $this->payment_submethods['rtbt_nordea_sweden'] = array( |
| 604 | 604 | 'paymentproductid' => 805, |
| 605 | | - 'label' => 'Nordea (Sweeden)', |
| | 605 | + 'label' => 'Nordea (Sweden)', |
| 606 | 606 | 'group' => 'rtbt', |
| 607 | 607 | 'validation' => array(), |
| 608 | 608 | ); |
| — | — | @@ -1209,7 +1209,7 @@ |
| 1210 | 1210 | break; |
| 1211 | 1211 | |
| 1212 | 1212 | /* Real time bank transfer */ |
| 1213 | | - case 'rtbt_nordea_sweeden': |
| | 1213 | + case 'rtbt_nordea_sweden': |
| 1214 | 1214 | case 'rtbt_enets': |
| 1215 | 1215 | case 'rtbt_sofortuberweisung': |
| 1216 | 1216 | $this->staged_data['payment_product'] = $this->payment_submethods[ $payment_submethod ]['paymentproductid']; |
| Index: trunk/extensions/DonationInterface/tests/Adapter/GlobalCollect/RealTimeBankTransferNordeaSweedenTestCase.php |
| — | — | @@ -1,58 +0,0 @@ |
| 2 | | -<?php |
| 3 | | -/** |
| 4 | | - * Wikimedia Foundation |
| 5 | | - * |
| 6 | | - * LICENSE |
| 7 | | - * |
| 8 | | - * This program is free software; you can redistribute it and/or modify |
| 9 | | - * it under the terms of the GNU General Public License as published by |
| 10 | | - * the Free Software Foundation; either version 2 of the License, or |
| 11 | | - * (at your option) any later version. |
| 12 | | - * |
| 13 | | - * This program is distributed in the hope that it will be useful, |
| 14 | | - * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 15 | | - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| 16 | | - * GNU General Public License for more details. |
| 17 | | - * |
| 18 | | - * @since r100823 |
| 19 | | - * @author Jeremy Postlethwaite <jpostlethwaite@wikimedia.org> |
| 20 | | - */ |
| 21 | | - |
| 22 | | -/** |
| 23 | | - * @see DonationInterfaceTestCase |
| 24 | | - */ |
| 25 | | -require_once dirname( dirname( dirname( __FILE__ ) ) ) . DIRECTORY_SEPARATOR . 'DonationInterfaceTestCase.php'; |
| 26 | | - |
| 27 | | -/** |
| 28 | | - * |
| 29 | | - * @group Fundraising |
| 30 | | - * @group Gateways |
| 31 | | - * @group DonationInterface |
| 32 | | - * @group GlobalCollect |
| 33 | | - * @group RealTimeBankTransfer |
| 34 | | - */ |
| 35 | | -class DonationInterface_Adapter_GlobalCollect_RealTimeBankTransferNordeaSweedenTestCase extends DonationInterfaceTestCase { |
| 36 | | - |
| 37 | | - /** |
| 38 | | - * testBuildRequestXml |
| 39 | | - * |
| 40 | | - * @covers GatewayAdapter::__construct |
| 41 | | - * @covers GatewayAdapter::setCurrentTransaction |
| 42 | | - * @covers GatewayAdapter::buildRequestXML |
| 43 | | - * @covers GatewayAdapter::getData |
| 44 | | - */ |
| 45 | | - public function testBuildRequestXml() { |
| 46 | | - |
| 47 | | - $optionsForTestData = array( |
| 48 | | - 'form_name' => 'TwoStepAmount', |
| 49 | | - 'payment_method' => 'rtbt', |
| 50 | | - 'payment_submethod' => 'rtbt_nordea_sweeden', |
| 51 | | - 'payment_product_id' => 805, |
| 52 | | - ); |
| 53 | | - |
| 54 | | - $options = $this->getGatewayAdapterTestDataFromSpain( $optionsForTestData ); |
| 55 | | - |
| 56 | | - $this->buildRequestXmlForGlobalCollect( $optionsForTestData, $options ); |
| 57 | | - } |
| 58 | | -} |
| 59 | | - |
| Index: trunk/extensions/DonationInterface/tests/Adapter/GlobalCollect/AllTests.php |
| — | — | @@ -45,9 +45,9 @@ |
| 46 | 46 | require_once dirname( __FILE__ ) . DIRECTORY_SEPARATOR . 'RealTimeBankTransferIdealTestCase.php'; |
| 47 | 47 | |
| 48 | 48 | /** |
| 49 | | - * @see DonationInterface_Adapter_GlobalCollect_RealTimeBankTransferNordeaSweedenTestCase |
| | 49 | + * @see DonationInterface_Adapter_GlobalCollect_RealTimeBankTransferNordeaSwedenTestCase |
| 50 | 50 | */ |
| 51 | | -require_once dirname( __FILE__ ) . DIRECTORY_SEPARATOR . 'RealTimeBankTransferNordeaSweedenTestCase.php'; |
| | 51 | +require_once dirname( __FILE__ ) . DIRECTORY_SEPARATOR . 'RealTimeBankTransferNordeaSwedenTestCase.php'; |
| 52 | 52 | |
| 53 | 53 | /** |
| 54 | 54 | * @see DonationInterface_Adapter_GlobalCollect_RealTimeBankTransferSofortuberweisungTestCase |
| — | — | @@ -99,8 +99,8 @@ |
| 100 | 100 | // Ideal |
| 101 | 101 | $suite->addTestSuite( 'DonationInterface_Adapter_GlobalCollect_RealTimeBankTransferIdealTestCase' ); |
| 102 | 102 | |
| 103 | | - // Nordea (Sweeden) |
| 104 | | - $suite->addTestSuite( 'DonationInterface_Adapter_GlobalCollect_RealTimeBankTransferNordeaSweedenTestCase' ); |
| | 103 | + // Nordea (Sweden) |
| | 104 | + $suite->addTestSuite( 'DonationInterface_Adapter_GlobalCollect_RealTimeBankTransferNordeaSwedenTestCase' ); |
| 105 | 105 | |
| 106 | 106 | // eNETS |
| 107 | 107 | $suite->addTestSuite( 'DonationInterface_Adapter_GlobalCollect_RealTimeBankTransferSofortuberweisungTestCase' ); |
| Index: trunk/extensions/DonationInterface/tests/Adapter/GlobalCollect/RealTimeBankTransferNordeaSwedenTestCase.php |
| — | — | @@ -0,0 +1,58 @@ |
| | 2 | +<?php |
| | 3 | +/** |
| | 4 | + * Wikimedia Foundation |
| | 5 | + * |
| | 6 | + * LICENSE |
| | 7 | + * |
| | 8 | + * This program is free software; you can redistribute it and/or modify |
| | 9 | + * it under the terms of the GNU General Public License as published by |
| | 10 | + * the Free Software Foundation; either version 2 of the License, or |
| | 11 | + * (at your option) any later version. |
| | 12 | + * |
| | 13 | + * This program is distributed in the hope that it will be useful, |
| | 14 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| | 15 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| | 16 | + * GNU General Public License for more details. |
| | 17 | + * |
| | 18 | + * @since r100823 |
| | 19 | + * @author Jeremy Postlethwaite <jpostlethwaite@wikimedia.org> |
| | 20 | + */ |
| | 21 | + |
| | 22 | +/** |
| | 23 | + * @see DonationInterfaceTestCase |
| | 24 | + */ |
| | 25 | +require_once dirname( dirname( dirname( __FILE__ ) ) ) . DIRECTORY_SEPARATOR . 'DonationInterfaceTestCase.php'; |
| | 26 | + |
| | 27 | +/** |
| | 28 | + * |
| | 29 | + * @group Fundraising |
| | 30 | + * @group Gateways |
| | 31 | + * @group DonationInterface |
| | 32 | + * @group GlobalCollect |
| | 33 | + * @group RealTimeBankTransfer |
| | 34 | + */ |
| | 35 | +class DonationInterface_Adapter_GlobalCollect_RealTimeBankTransferNordeaSwedenTestCase extends DonationInterfaceTestCase { |
| | 36 | + |
| | 37 | + /** |
| | 38 | + * testBuildRequestXml |
| | 39 | + * |
| | 40 | + * @covers GatewayAdapter::__construct |
| | 41 | + * @covers GatewayAdapter::setCurrentTransaction |
| | 42 | + * @covers GatewayAdapter::buildRequestXML |
| | 43 | + * @covers GatewayAdapter::getData |
| | 44 | + */ |
| | 45 | + public function testBuildRequestXml() { |
| | 46 | + |
| | 47 | + $optionsForTestData = array( |
| | 48 | + 'form_name' => 'TwoStepAmount', |
| | 49 | + 'payment_method' => 'rtbt', |
| | 50 | + 'payment_submethod' => 'rtbt_nordea_sweden', |
| | 51 | + 'payment_product_id' => 805, |
| | 52 | + ); |
| | 53 | + |
| | 54 | + $options = $this->getGatewayAdapterTestDataFromSpain( $optionsForTestData ); |
| | 55 | + |
| | 56 | + $this->buildRequestXmlForGlobalCollect( $optionsForTestData, $options ); |
| | 57 | + } |
| | 58 | +} |
| | 59 | + |
| Property changes on: trunk/extensions/DonationInterface/tests/Adapter/GlobalCollect/RealTimeBankTransferNordeaSwedenTestCase.php |
| ___________________________________________________________________ |
| Added: svn:eol-style |
| 1 | 60 | + native |
| Added: svn:mime-type |
| 2 | 61 | + text/plain |
| Added: svn:keywords |
| 3 | 62 | + Author Date HeadURL Header Id Revision |
| Index: trunk/extensions/DonationInterface/tests/macros/form.twostepamount.realtimebanktransfer.nordea_sweden.htm |
| — | — | @@ -13,7 +13,7 @@ |
| 14 | 14 | </thead><tbody> |
| 15 | 15 | <tr> |
| 16 | 16 | <td>open</td> |
| 17 | | - <td>/index.php/Special:GlobalCollectGateway?form_name=TwoStepAmount&payment_method=rtbt&payment_submethod=rtbt_nordea_sweeden</td> |
| | 17 | + <td>/index.php/Special:GlobalCollectGateway?form_name=TwoStepAmount&payment_method=rtbt&payment_submethod=rtbt_nordea_sweden</td> |
| 18 | 18 | <td></td> |
| 19 | 19 | </tr> |
| 20 | 20 | <tr> |
| — | — | @@ -29,7 +29,7 @@ |
| 30 | 30 | <tr> |
| 31 | 31 | <td>select</td> |
| 32 | 32 | <td>id=country</td> |
| 33 | | - <td>label=Netherlands</td> |
| | 33 | + <td>label=Sweden</td> |
| 34 | 34 | </tr> |
| 35 | 35 | <tr> |
| 36 | 36 | <td>type</td> |
| — | — | @@ -48,15 +48,20 @@ |
| 49 | 49 | </tr> |
| 50 | 50 | <tr> |
| 51 | 51 | <td>click</td> |
| 52 | | - <td>//input[@name='amountRadio' and @value='250']</td> |
| | 52 | + <td>//input[@name='amountRadio' and @value='10']</td> |
| 53 | 53 | <td></td> |
| 54 | 54 | </tr> |
| 55 | 55 | <tr> |
| 56 | 56 | <td>click</td> |
| 57 | | - <td>//table[@id='amount-radio']/tbody/tr[2]/td[3]/label</td> |
| | 57 | + <td>//table[@id='amount-radio']/tbody/tr/td[2]/label</td> |
| 58 | 58 | <td></td> |
| 59 | 59 | </tr> |
| 60 | 60 | <tr> |
| | 61 | + <td>select</td> |
| | 62 | + <td>id=input_currency_code</td> |
| | 63 | + <td>label=Swedish krona</td> |
| | 64 | +</tr> |
| | 65 | +<tr> |
| 61 | 66 | <td>clickAndWait</td> |
| 62 | 67 | <td>css=input.button-plain</td> |
| 63 | 68 | <td></td> |
| — | — | @@ -66,11 +71,6 @@ |
| 67 | 72 | <td>css=p.payment_error_message.payment_error_message_general</td> |
| 68 | 73 | <td>There was an error processing your transaction. Please try again later.</td> |
| 69 | 74 | </tr> |
| 70 | | -<tr> |
| 71 | | - <td>select</td> |
| 72 | | - <td>id=input_currency_code</td> |
| 73 | | - <td>label=EUR: Euro</td> |
| 74 | | -</tr> |
| 75 | 75 | </tbody></table> |
| 76 | 76 | </body> |
| 77 | 77 | </html> |