Ejegg has submitted this change and it was merged.
Change subject: Merge branch 'master' into deployment
......................................................................
Merge branch 'master' into deployment
59151bf Blank submethod on method change, OID on recur change
Conflicts:
tests/Adapter/GatewayAdapterTest.php
Change-Id: I2380050b42b8643050ed59b0a4d1b2675385b570
---
D tests/Adapter/GatewayAdapterTest.php
1 file changed, 0 insertions(+), 236 deletions(-)
Approvals:
Ejegg: Looks good to me, approved
diff --git a/tests/Adapter/GatewayAdapterTest.php
b/tests/Adapter/GatewayAdapterTest.php
deleted file mode 100644
index d871e13..0000000
--- a/tests/Adapter/GatewayAdapterTest.php
+++ /dev/null
@@ -1,236 +0,0 @@
-<<<<<<< HEAD (b4c2b2 Merge branch 'master' into deployment)
-=======
-<?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.
- *
- */
-
-/**
- * TODO: Test everything.
- * Make sure all the basic functions in the gateway_adapter are tested here.
- * Also, the extras and their hooks firing properly and... that the fail score
- * they give back is acted upon in the way we think it does.
- * Hint: For that mess, use GatewayAdapter's $debugarray
- *
- * Also, note that it barely makes sense to test the functions that need to be
- * defined in each gateway as per the abstract class. If we did that here,
we'd
- * basically be just testing the test code. So, don't do it.
- * Those should definitely be tested in the various gateway-specific test
- * classes.
- *
- * @group Fundraising
- * @group DonationInterface
- * @group Splunge
- */
-class DonationInterface_Adapter_GatewayAdapterTest extends
DonationInterfaceTestCase {
-
- /**
- * @param $name string The name of the test case
- * @param $data array Any parameters read from a dataProvider
- * @param $dataName string|int The name or index of the data set
- */
- public function __construct( $name = null, array $data = array(),
$dataName = '' ) {
- global $wgDonationInterfaceAllowedHtmlForms;
- global $wgDonationInterfaceTest;
- $wgDonationInterfaceTest = true;
- parent::__construct( $name, $data, $dataName );
- }
-
- public function setUp() {
- parent::setUp();
-
- $this->setMwGlobals( array(
- 'wgDonationInterfaceAllowedHtmlForms' => array(
- 'testytest' => array(
- 'gateway' => 'globalcollect', //RAR.
- ),
- ),
- ) );
- }
-
- /**
- *
- * @covers GatewayAdapter::__construct
- * @covers GatewayAdapter::defineVarMap
- * @covers GatewayAdapter::defineReturnValueMap
- * @covers GatewayAdapter::defineTransactions
- */
- public function testConstructor() {
-
- $options = $this->getDonorTestData();
- $class = $this->testAdapterClass;
-
- $_SERVER['REQUEST_URI'] =
GatewayFormChooser::buildPaymentsFormURL( 'testytest', array ( 'gateway' =>
$class::getIdentifier() ) );
- $gateway = $this->getFreshGatewayObject( $options );
-
- $this->assertInstanceOf( TESTS_ADAPTER_DEFAULT, $gateway );
-
- $this->resetAllEnv();
- $gateway = $this->getFreshGatewayObject( $options = array ( ) );
- $this->assertInstanceOf( TESTS_ADAPTER_DEFAULT, $gateway,
"Having trouble constructing a blank adapter." );
- }
-
- /**
- *
- * @covers GatewayAdapter::__construct
- * @covers DonationData::__construct
- */
- public function testConstructorHasDonationData() {
-
- $_SERVER['REQUEST_URI'] =
'/index.php/Special:GlobalCollectGateway?form_name=TwoStepAmount';
-
- $options = $this->getDonorTestData();
- $gateway = $this->getFreshGatewayObject( $options );
-
- $this->assertInstanceOf( 'TestingGlobalCollectAdapter',
$gateway );
-
- //please define this function only inside the
TESTS_ADAPTER_DEFAULT,
- //which should be a test adapter object that descende from one
of the
- //production adapters.
- $exposed = TestingAccessWrapper::newFromObject( $gateway );
- $this->assertInstanceOf( 'DonationData', $exposed->dataObj );
- }
-
- public function testLanguageChange() {
- $options = $this->getDonorTestData( 'US' );
- $options['payment_method'] = 'cc';
- $options['payment_submethod'] = 'visa';
- $gateway = $this->getFreshGatewayObject( $options );
-
- $exposed = TestingAccessWrapper::newFromObject( $gateway );
- $this->assertEquals( $exposed->getData_Staged( 'language' ),
'en', "'US' donor's language was inproperly set. Should be 'en'" );
- $gateway->do_transaction( 'INSERT_ORDERWITHPAYMENT' );
- //so we know it tried to screw with the session and such.
-
- $options = $this->getDonorTestData( 'NO' );
- $gateway = $this->getFreshGatewayObject( $options );
- $exposed = TestingAccessWrapper::newFromObject( $gateway );
- $this->assertEquals( $exposed->getData_Staged( 'language' ),
'no', "'NO' donor's language was inproperly set. Should be 'no'" );
- }
-
- /**
- * Make sure data is cleared out when changing gateways.
- * In particular, ensure order IDs aren't leaking.
- */
- public function testResetOnGatewaySwitch() {
- //Fill the session with some Amazon stuff
- $init = $this->getDonorTestData( 'FR' );
- $init['contribution_tracking_id'] = mt_rand();
- $amazon_gateway = new TestingAmazonAdapter( array (
- 'external_data' => $init,
- ) );
- $amazon_gateway->do_transaction( 'Donate' );
-
- $this->assertEquals( 'amazon', $_SESSION['Donor']['gateway'],
'Test setup failed.' );
-
- //Then simpulate switching to Worldpay
- $_SESSION['sequence'] = 2;
- unset( $_POST['order_id'] );
-
- $worldpay_gateway = new TestingWorldpayAdapter( array (
- 'external_data' => $init,
- ) );
- $worldpay_gateway->batch_mode = TRUE;
-
- $expected_order_id =
"{$init['contribution_tracking_id']}.{$_SESSION['sequence']}";
- $this->assertEquals( $expected_order_id,
$worldpay_gateway->getData_Unstaged_Escaped( 'order_id' ),
- 'Order ID was not regenerated on gateway switch!' );
- }
-
- public function testResetOnRecurringSwitch() {
- // Donor initiates a non-recurring donation
- $init = $this->getDonorTestData();
- $init['payment_method'] = 'cc';
-
- $this->setMwGlobals( 'wgRequest', new FauxRequest( $init, false
) );
-
- $gateway = new TestingGlobalCollectAdapter();
- $gateway->do_transaction( 'Donate' );
-
- $this->assertEquals( '', $_SESSION['Donor']['recurring'], 'Test
setup failed.' );
- $oneTimeOrderId = $gateway->getData_Unstaged_Escaped(
'order_id' );
-
- // Then they go back and decide they want to make a recurring
donation
-
- $init['recurring'] = '1';
- $this->setMwGlobals( 'wgRequest', new FauxRequest( $init, false
) );
-
- $gateway = new TestingGlobalCollectAdapter();
- $gateway->do_transaction( 'Donate' );
- $this->assertEquals( '1', $_SESSION['Donor']['recurring'],
'Test setup failed.' );
-
- $recurOrderId = $gateway->getData_Unstaged_Escaped( 'order_id'
);
-
- $this->assertNotEquals( $oneTimeOrderId, $recurOrderId,
- 'Order ID was not regenerated on recurring switch!' );
- }
-
- public function testResetSubmethodOnMethodSwitch() {
- // Donor thinks they want to make a bank transfer, submits form
- $init = $this->getDonorTestData( 'BR' );
- $init['payment_method'] = 'bt';
- $init['payment_submethod'] = 'itau';
-
- $this->setMwGlobals( 'wgRequest', new FauxRequest( $init, false
) );
-
- $gateway = new TestingAstropayAdapter();
- $gateway->do_transaction( 'Donate' );
-
- $this->assertEquals( 'itau',
$_SESSION['Donor']['payment_submethod'], 'Test setup failed.' );
-
- // Then they go back and decide they want to donate via credit
card
- $init['payment_method'] = 'cc';
- unset( $init['payment_submethod'] );
- $this->setMwGlobals( 'wgRequest', new FauxRequest( $init, false
) );
-
- $gateway = new TestingAstropayAdapter();
- $newMethod = $gateway->getData_Unstaged_Escaped(
'payment_method' );
- $newSubmethod = $gateway->getData_Unstaged_Escaped(
'payment_submethod' );
-
- $this->assertEquals( 'cc', $newMethod , 'Test setup failed' );
- $this->assertEquals( '', $newSubmethod , 'Submethod was not
blanked on method switch' );
- }
-
- public function testStreetStaging() {
- $options = $this->getDonorTestData( 'BR' );
- unset( $options['street'] );
- $options['payment_method'] = 'cc';
- $options['payment_submethod'] = 'visa';
- $gateway = $this->getFreshGatewayObject( $options );
-
- $exposed = TestingAccessWrapper::newFromObject( $gateway );
- $exposed->stageData();
-
- $this->assertEquals( $exposed->getData_Staged( 'street' ),
'N0NE PROVIDED',
- 'Street must be stuffed with fake data to prevent AVS
scam.' );
- }
-
- public function testZipStaging() {
- $options = $this->getDonorTestData( 'BR' );
- unset( $options['zip'] );
- $options['payment_method'] = 'cc';
- $options['payment_submethod'] = 'visa';
- $gateway = $this->getFreshGatewayObject( $options );
-
- $exposed = TestingAccessWrapper::newFromObject( $gateway );
- $exposed->stageData();
-
- $this->assertEquals( $exposed->getData_Staged( 'zip' ), '0',
- 'Postal code must be stuffed with fake data to prevent
AVS scam.' );
- }
-}
-
->>>>>>> BRANCH (59151b Blank submethod on method change, OID on recur change)
--
To view, visit https://gerrit.wikimedia.org/r/232753
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2380050b42b8643050ed59b0a4d1b2675385b570
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg <eeggles...@wikimedia.org>
Gerrit-Reviewer: Ejegg <eeggles...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
