Cdentinger has uploaded a new change for review.
https://gerrit.wikimedia.org/r/274983
Change subject: Merge master into deployment
......................................................................
Merge master into deployment
e359cbf remove Friesland Bank
Removed tests
Change-Id: I4fa512be0bfdeec2642e9346ec878d718896e239
---
D tests/Adapter/GlobalCollect/RealTimeBankTransferIdealTest.php
1 file changed, 0 insertions(+), 349 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DonationInterface
refs/changes/83/274983/1
diff --git a/tests/Adapter/GlobalCollect/RealTimeBankTransferIdealTest.php
b/tests/Adapter/GlobalCollect/RealTimeBankTransferIdealTest.php
deleted file mode 100644
index c92cd0f..0000000
--- a/tests/Adapter/GlobalCollect/RealTimeBankTransferIdealTest.php
+++ /dev/null
@@ -1,349 +0,0 @@
-<<<<<<< HEAD (86e4c4 Fix bad merge)
-=======
-<?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.
- *
- */
-
-/**
- *
- * @group Fundraising
- * @group DonationInterface
- * @group GlobalCollect
- * @group RealTimeBankTransfer
- */
-class DonationInterface_Adapter_GlobalCollect_RealTimeBankTransferIdealTest
extends DonationInterfaceTestCase {
- public function setUp() {
- global $wgGlobalCollectGatewayHtmlFormDir;
-
- parent::setUp();
-
- $this->setMwGlobals( array(
- 'wgGlobalCollectGatewayEnabled' => true,
- 'wgDonationInterfaceAllowedHtmlForms' => array(
- 'rtbt-ideal' => array(
- 'file' =>
$wgGlobalCollectGatewayHtmlFormDir . '/rtbt/rtbt-ideal.html',
- 'gateway' => 'globalcollect',
- 'payment_methods' => array('rtbt' =>
'rtbt_ideal'),
- 'countries' => array( '+' => 'NL' ),
- 'currencies' => array( '+' => 'EUR' ),
- ),
- ),
- ) );
- }
-
- /**
- * Test for ideal form loading
- */
- public function testGCFormLoad_rtbt_Ideal() {
- $init = $this->getDonorTestData( 'NL' );
- unset( $init['order_id'] );
- $init['payment_method'] = 'rtbt';
- $init['ffname'] = 'rtbt-ideal';
-
- $assertNodes = array (
- //can't do the selected-amount test here, because
apparently javascript. So...
-
- 'amount' => array (
- 'nodename' => 'input',
- 'value' => '1.55',
- ),
- 'currency_code' => array (
- 'nodename' => 'input',
- 'value' => 'EUR',
- ),
- 'country' => array (
- 'nodename' => 'input',
- 'value' => 'NL',
- ),
- );
-
- $this->verifyFormOutput( 'TestingGlobalCollectGateway', $init,
$assertNodes, true );
- }
-
- /**
- * testBuildRequestXmlWithIssuerId21
- *
- * Rabobank: 21
- *
- * @covers GatewayAdapter::__construct
- * @covers GatewayAdapter::setCurrentTransaction
- * @covers GatewayAdapter::buildRequestXML
- * @covers GatewayAdapter::getData_Unstaged_Escaped
- */
- public function testBuildRequestXmlWithIssuerId21() {
-
- $optionsForTestData = array(
- 'form_name' => 'TwoStepAmount',
- 'payment_method' => 'rtbt',
- 'payment_submethod' => 'rtbt_ideal',
- 'payment_product_id' => 809,
- 'issuer_id' => 21,
- );
-
- //somewhere else?
- $options = $this->getDonorTestData( 'ES' );
- $options = array_merge( $options, $optionsForTestData );
- unset( $options['payment_product_id'] );
-
- $this->buildRequestXmlForGlobalCollect( $optionsForTestData,
$options );
- }
-
- /**
- * testBuildRequestXmlWithIssuerId31
- *
- * ABN AMRO: 31
- *
- * @covers GatewayAdapter::__construct
- * @covers GatewayAdapter::setCurrentTransaction
- * @covers GatewayAdapter::buildRequestXML
- * @covers GatewayAdapter::getData_Unstaged_Escaped
- */
- public function testBuildRequestXmlWithIssuerId31() {
-
- $optionsForTestData = array(
- 'form_name' => 'TwoStepAmount',
- 'payment_method' => 'rtbt',
- 'payment_submethod' => 'rtbt_ideal',
- 'payment_product_id' => 809,
- 'issuer_id' => 31,
- );
-
- //somewhere else?
- $options = $this->getDonorTestData( 'ES' );
- $options = array_merge( $options, $optionsForTestData );
- unset( $options['payment_product_id'] );
-
- $this->buildRequestXmlForGlobalCollect( $optionsForTestData,
$options );
- }
-
- /**
- * testBuildRequestXmlWithIssuerId91
- *
- * Rabobank: 21
- *
- * @covers GatewayAdapter::__construct
- * @covers GatewayAdapter::setCurrentTransaction
- * @covers GatewayAdapter::buildRequestXML
- * @covers GatewayAdapter::getData_Unstaged_Escaped
- */
- public function testBuildRequestXmlWithIssuerId91() {
-
- $optionsForTestData = array(
- 'form_name' => 'TwoStepAmount',
- 'payment_method' => 'rtbt',
- 'payment_submethod' => 'rtbt_ideal',
- 'payment_product_id' => 809,
- 'issuer_id' => 21,
- );
-
- //somewhere else?
- $options = $this->getDonorTestData( 'ES' );
- $options = array_merge( $options, $optionsForTestData );
- unset( $options['payment_product_id'] );
-
- $this->buildRequestXmlForGlobalCollect( $optionsForTestData,
$options );
- }
-
- /**
- * testBuildRequestXmlWithIssuerId161
- *
- * Van Lanschot Bankiers: 161
- *
- * @covers GatewayAdapter::__construct
- * @covers GatewayAdapter::setCurrentTransaction
- * @covers GatewayAdapter::buildRequestXML
- * @covers GatewayAdapter::getData_Unstaged_Escaped
- */
- public function testBuildRequestXmlWithIssuerId161() {
-
- $optionsForTestData = array(
- 'form_name' => 'TwoStepAmount',
- 'payment_method' => 'rtbt',
- 'payment_submethod' => 'rtbt_ideal',
- 'payment_product_id' => 809,
- 'issuer_id' => 161,
- );
-
- //somewhere else?
- $options = $this->getDonorTestData( 'ES' );
- $options = array_merge( $options, $optionsForTestData );
- unset( $options['payment_product_id'] );
-
- $this->buildRequestXmlForGlobalCollect( $optionsForTestData,
$options );
- }
-
- /**
- * testBuildRequestXmlWithIssuerId511
- *
- * Triodos Bank: 511
- *
- * @covers GatewayAdapter::__construct
- * @covers GatewayAdapter::setCurrentTransaction
- * @covers GatewayAdapter::buildRequestXML
- * @covers GatewayAdapter::getData_Unstaged_Escaped
- */
- public function testBuildRequestXmlWithIssuerId511() {
-
- $optionsForTestData = array(
- 'form_name' => 'TwoStepAmount',
- 'payment_method' => 'rtbt',
- 'payment_submethod' => 'rtbt_ideal',
- 'payment_product_id' => 809,
- 'issuer_id' => 511,
- );
-
- //somewhere else?
- $options = $this->getDonorTestData( 'ES' );
- $options = array_merge( $options, $optionsForTestData );
- unset( $options['payment_product_id'] );
-
- $this->buildRequestXmlForGlobalCollect( $optionsForTestData,
$options );
- }
-
- /**
- * testBuildRequestXmlWithIssuerId721
- *
- * ING: 721
- *
- * @covers GatewayAdapter::__construct
- * @covers GatewayAdapter::setCurrentTransaction
- * @covers GatewayAdapter::buildRequestXML
- * @covers GatewayAdapter::getData_Unstaged_Escaped
- */
- public function testBuildRequestXmlWithIssuerId721() {
-
- $optionsForTestData = array(
- 'form_name' => 'TwoStepAmount',
- 'payment_method' => 'rtbt',
- 'payment_submethod' => 'rtbt_ideal',
- 'payment_product_id' => 809,
- 'issuer_id' => 721,
- );
-
- //somewhere else?
- $options = $this->getDonorTestData( 'ES' );
- $options = array_merge( $options, $optionsForTestData );
- unset( $options['payment_product_id'] );
-
- $this->buildRequestXmlForGlobalCollect( $optionsForTestData,
$options );
- }
-
- /**
- * testBuildRequestXmlWithIssuerId751
- *
- * SNS Bank: 751
- *
- * @covers GatewayAdapter::__construct
- * @covers GatewayAdapter::setCurrentTransaction
- * @covers GatewayAdapter::buildRequestXML
- * @covers GatewayAdapter::getData_Unstaged_Escaped
- */
- public function testBuildRequestXmlWithIssuerId751() {
-
- $optionsForTestData = array(
- 'form_name' => 'TwoStepAmount',
- 'payment_method' => 'rtbt',
- 'payment_submethod' => 'rtbt_ideal',
- 'payment_product_id' => 809,
- 'issuer_id' => 751,
- );
-
- //somewhere else?
- $options = $this->getDonorTestData( 'ES' );
- $options = array_merge( $options, $optionsForTestData );
- unset( $options['payment_product_id'] );
-
- $this->buildRequestXmlForGlobalCollect( $optionsForTestData,
$options );
- }
-
- /**
- * testBuildRequestXmlWithIssuerId761
- *
- * ASN Bank: 761
- *
- * @covers GatewayAdapter::__construct
- * @covers GatewayAdapter::setCurrentTransaction
- * @covers GatewayAdapter::buildRequestXML
- * @covers GatewayAdapter::getData_Unstaged_Escaped
- */
- public function testBuildRequestXmlWithIssuerId761() {
-
- $optionsForTestData = array(
- 'form_name' => 'TwoStepAmount',
- 'payment_method' => 'rtbt',
- 'payment_submethod' => 'rtbt_ideal',
- 'payment_product_id' => 809,
- 'issuer_id' => 761,
- );
-
- //somewhere else?
- $options = $this->getDonorTestData( 'ES' );
- $options = array_merge( $options, $optionsForTestData );
- unset( $options['payment_product_id'] );
-
- $this->buildRequestXmlForGlobalCollect( $optionsForTestData,
$options );
- }
-
- /**
- * testBuildRequestXmlWithIssuerId771
- *
- * RegioBank: 771
- *
- * @covers GatewayAdapter::__construct
- * @covers GatewayAdapter::setCurrentTransaction
- * @covers GatewayAdapter::buildRequestXML
- * @covers GatewayAdapter::getData_Unstaged_Escaped
- */
- public function testBuildRequestXmlWithIssuerId771() {
-
- $optionsForTestData = array(
- 'form_name' => 'TwoStepAmount',
- 'payment_method' => 'rtbt',
- 'payment_submethod' => 'rtbt_ideal',
- 'payment_product_id' => 809,
- 'issuer_id' => 771,
- );
-
- //somewhere else?
- $options = $this->getDonorTestData( 'ES' );
- $options = array_merge( $options, $optionsForTestData );
- unset( $options['payment_product_id'] );
-
- $this->buildRequestXmlForGlobalCollect( $optionsForTestData,
$options );
- }
-
- public function testFormAction() {
-
- $optionsForTestData = array (
- 'payment_method' => 'rtbt',
- 'payment_submethod' => 'rtbt_ideal',
- 'issuer_id' => 771,
- );
-
- //somewhere else?
- $options = $this->getDonorTestData( 'ES' );
- $options = array_merge( $options, $optionsForTestData );
-
- $this->gatewayAdapter = $this->getFreshGatewayObject( $options
);
- $this->gatewayAdapter->do_transaction(
"INSERT_ORDERWITHPAYMENT" );
- $action = $this->gatewayAdapter->getTransactionDataFormAction();
- $this->assertEquals( "url_placeholder", $action, "The
formaction was not populated as expected (ideal)." );
- }
-
-}
-
->>>>>>> BRANCH (e359cb remove Friesland Bank)
--
To view, visit https://gerrit.wikimedia.org/r/274983
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4fa512be0bfdeec2642e9346ec878d718896e239
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: deployment
Gerrit-Owner: Cdentinger <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
