Katie Horn has submitted this change and it was merged.
Change subject: Merge branch 'master' into deploy
......................................................................
Merge branch 'master' into deploy
Conflicts:
tests/Adapter/GlobalCollect/GlobalCollectTest.php
Change-Id: I54b3622aba48d2b1312337b901a539097235cae9
---
D tests/Adapter/GlobalCollect/GlobalCollectTest.php
D
tests/includes/Responses/globalcollect/GET_ORDERSTATUS_20001000-expiry.testresponse
2 files changed, 0 insertions(+), 410 deletions(-)
Approvals:
Katie Horn: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/Adapter/GlobalCollect/GlobalCollectTest.php
b/tests/Adapter/GlobalCollect/GlobalCollectTest.php
deleted file mode 100644
index e72c226..0000000
--- a/tests/Adapter/GlobalCollect/GlobalCollectTest.php
+++ /dev/null
@@ -1,363 +0,0 @@
-<<<<<<< HEAD (1e77a3 Merge branch 'master' into deploy)
-=======
-<?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
- */
-class DonationInterface_Adapter_GlobalCollect_GlobalCollectTest 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
- */
- function __construct( $name = null, array $data = array(), $dataName =
'' ) {
- parent::__construct( $name, $data, $dataName );
- $this->testAdapterClass = 'TestingGlobalCollectAdapter';
- }
-
- function tearDown() {
- TestingGlobalCollectAdapter::clearGlobalsCache();
- parent::tearDown();
- }
-
- /**
- * testnormalizeOrderID
- * Non-exhaustive integration tests to verify that order_id
- * normalization works as expected with different settings and
- * conditions in theGlobalCollect adapter
- * @covers GatewayAdapter::normalizeOrderID
- */
- public function testNormalizeOrderID() {
- $init = $this->initial_vars;
- unset( $init['order_id'] );
-
- //no order_id from anywhere, explicit no generate
- $gateway = $this->getFreshGatewayObject( $init, array (
'order_id_meta' => array ( 'generate' => FALSE ) ) );
- $this->assertFalse( $gateway->getOrderIDMeta( 'generate' ),
'The order_id meta generate setting override is not working properly. Deferred
order_id generation may be broken.' );
- $this->assertNull( $gateway->getData_Unstaged_Escaped(
'order_id' ), 'Failed asserting that an absent order id is left as null, when
not generating our own' );
-
- //no order_id from anywhere, explicit generate
- $gateway = $this->getFreshGatewayObject( $init, array (
'order_id_meta' => array ( 'generate' => TRUE ) ) );
- $this->assertTrue( $gateway->getOrderIDMeta( 'generate' ), 'The
order_id meta generate setting override is not working properly. Self order_id
generation may be broken.' );
- $this->assertInternalType( 'numeric',
$gateway->getData_Unstaged_Escaped( 'order_id' ), 'Generated order_id is not
numeric, which it should be for GlobalCollect' );
-
- $_GET['order_id'] = '55555';
- $_SESSION['Donor']['order_id'] = '44444';
-
- //conflicting order_id in $GET and $SESSION, default GC
generation
- $gateway = $this->getFreshGatewayObject( $init );
- $this->assertEquals( '55555',
$gateway->getData_Unstaged_Escaped( 'order_id' ), 'GlobalCollect gateway is
preferring session data over the $_GET. Session should be secondary.' );
-
- //conflicting order_id in $GET and $SESSION, garbage data in
$_GET, default GC generation
- $_GET['order_id'] = 'nonsense!';
- $gateway = $this->getFreshGatewayObject( $init );
- $this->assertEquals( '44444',
$gateway->getData_Unstaged_Escaped( 'order_id' ), 'GlobalCollect gateway is not
ignoring nonsensical order_id candidates' );
-
- unset( $_GET['order_id'] );
- //order_id in $SESSION, default GC generation
- $gateway = $this->getFreshGatewayObject( $init );
- $this->assertEquals( '44444',
$gateway->getData_Unstaged_Escaped( 'order_id' ), 'GlobalCollect gateway is not
recognizing the session order_id' );
-
- $_POST['order_id'] = '33333';
- //conflicting order_id in $_POST and $SESSION, default GC
generation
- $gateway = $this->getFreshGatewayObject( $init );
- $this->assertEquals( '33333',
$gateway->getData_Unstaged_Escaped( 'order_id' ), 'GlobalCollect gateway is
preferring session data over the $_POST. Session should be secondary.' );
-
- $init['order_id'] = '22222';
- //conflicting order_id in init data, $_POST and $SESSION,
explicit GC generation, batch mode
- $gateway = $this->getFreshGatewayObject( $init, array (
'order_id_meta' => array ( 'generate' => TRUE ), 'batch_mode' => TRUE, ) );
- $this->assertEquals( $init['order_id'],
$gateway->getData_Unstaged_Escaped( 'order_id' ), 'Failed asserting that an
extrenally provided order id is being honored in batch mode' );
-
- //make sure that decimal numbers are rejected by GC. Should be
a toss and regen
- $init['order_id'] = '2143.0';
- unset( $_POST['order_id'] );
- unset( $_SESSION['Donor']['order_id'] );
- //conflicting order_id in init data, $_POST and $SESSION,
explicit GC generation, batch mode
- $gateway = $this->getFreshGatewayObject( $init, array (
'order_id_meta' => array ( 'generate' => TRUE, 'disallow_decimals' => TRUE ),
'batch_mode' => TRUE, ) );
- $this->assertNotEquals( $init['order_id'],
$gateway->getData_Unstaged_Escaped( 'order_id' ), 'Failed assering that a
decimal order_id was regenerated, when disallow_decimals is true' );
- }
-
- /**
- * Non-exhaustive integration tests to verify that order_id, when in
- * self-generation mode, won't regenerate until it is told to.
- * @covers GatewayAdapter::normalizeOrderID
- * @covers GatewayAdapter::regenerateOrderID
- */
- function testStickyGeneratedOrderID() {
- $init = $this->initial_vars;
- unset( $init['order_id'] );
-
- //no order_id from anywhere, explicit generate
- $gateway = $this->getFreshGatewayObject( $init, array (
'order_id_meta' => array ( 'generate' => TRUE ) ) );
- $this->assertNotNull( $gateway->getData_Unstaged_Escaped(
'order_id' ), 'Generated order_id is null. The rest of this test is broken.' );
- $original_order_id = $gateway->getData_Unstaged_Escaped(
'order_id' );
-
- $gateway->normalizeOrderID();
- $this->assertEquals( $original_order_id,
$gateway->getData_Unstaged_Escaped( 'order_id' ), 'Re-normalized order_id has
changed without explicit regeneration.' );
-
- //this might look a bit strange, but we need to be able to
generate valid order_ids without making them stick to anything.
- $gateway->generateOrderID();
- $this->assertEquals( $original_order_id,
$gateway->getData_Unstaged_Escaped( 'order_id' ), 'function generateOrderID
auto-changed the selected order ID. Not cool.' );
-
- $gateway->regenerateOrderID();
- $this->assertNotEquals( $original_order_id,
$gateway->getData_Unstaged_Escaped( 'order_id' ), 'Re-normalized order_id has
not changed, after explicit regeneration.' );
- }
-
- /**
- * Integration test to verify that order_id can be retrieved from
- * performing an INSERT_ORDERWITHPAYMENT.
- */
- function testOrderIDRetrieval() {
- $init = $this->getDonorTestData();
- unset( $init['order_id'] );
- $init['payment_method'] = 'cc';
- $init['payment_submethod'] = 'visa';
-
- //no order_id from anywhere, explicit generate
- $gateway = $this->getFreshGatewayObject( $init, array (
'order_id_meta' => array ( 'generate' => FALSE ) ) );
- $this->assertNull( $gateway->getData_Unstaged_Escaped(
'order_id' ), 'Ungenerated order_id is not null. The rest of this test is
broken.' );
-
- $gateway->do_transaction( 'INSERT_ORDERWITHPAYMENT' );
-
- $this->assertNotNull( $gateway->getData_Unstaged_Escaped(
'order_id' ), 'No order_id was retrieved from INSERT_ORDERWITHPAYMENT' );
- }
-
- /**
- * Just run the GET_ORDERSTATUS transaction and make sure we load the
data
- */
- function testGetOrderStatus() {
- $init = $this->getDonorTestData();
- $init['payment_method'] = 'cc';
- $init['payment_submethod'] = 'visa';
- $init['email'] = '[email protected]';
-
- $gateway = $this->getFreshGatewayObject( $init );
-
- $gateway->do_transaction( 'GET_ORDERSTATUS' );
-
- $data = $gateway->getTransactionData();
-
- $this->assertEquals( 'N', $data['CVVRESULT'], 'CVV Result not
loaded from XML response' );
- }
-
- /**
- * We should skip the API call if we're already suspicious
- */
- function testGetOrderStatusSkipsIfFail() {
- DonationInterface_FraudFiltersTest::setupFraudMaps();
-
- $init = $this->getDonorTestData();
- $init['payment_method'] = 'cc';
- $init['payment_submethod'] = 'visa';
- $init['email'] = '[email protected]'; //configured as a
fraudy domain
-
- $gateway = $this->getFreshGatewayObject( $init );
-
- $gateway->do_transaction( 'GET_ORDERSTATUS' );
-
- $data = $gateway->getTransactionData();
-
- $this->assertEquals( null, $data['CVVRESULT'], 'preprocess
should stop API call if fraud detected' );
- }
-
- /**
- * Ensure the Confirm_CreditCard transaction prefers CVVRESULT from the
XML
- * over any value from the querystring
- */
- function testConfirmCreditCardPrefersXmlCvv() {
- $init = $this->getDonorTestData();
- $init['payment_method'] = 'cc';
- $init['payment_submethod'] = 'visa';
- $init['email'] = '[email protected]';
-
- $this->setMwGlobals( 'wgRequest',
- new FauxRequest( array( 'CVVRESULT' => 'M' ), false ) );
-
- $gateway = $this->getFreshGatewayObject( $init );
-
- $gateway->do_transaction( 'Confirm_CreditCard' );
-
- $this->assertEquals( 'N',
$gateway->getData_Unstaged_Escaped('cvv_result'), 'CVV Result not taken from
XML response' );
- }
-
- /**
- * If querystring and XML have different CVVRESULT, that's awfully fishy
- */
- function testConfirmCreditCardFailsOnCvvResultConflict() {
- $init = $this->getDonorTestData();
- $init['payment_method'] = 'cc';
- $init['payment_submethod'] = 'visa';
- $init['email'] = '[email protected]';
-
- $this->setMwGlobals( 'wgRequest',
- new FauxRequest( array( 'CVVRESULT' => 'M' ), false ) );
-
- $gateway = $this->getFreshGatewayObject( $init );
-
- $result = $gateway->do_transaction( 'Confirm_CreditCard' );
-
- $this->assertFalse( $result['status'], 'Credit card should fail
if querystring and XML have different CVVRESULT' );
- }
-
- /**
- * testDefineVarMap
- *
- * This is tested with a bank transfer from Spain.
- *
- * @covers GlobalCollectAdapter::__construct
- * @covers GlobalCollectAdapter::defineVarMap
- */
- public function testDefineVarMap() {
-
- $gateway = $this->getFreshGatewayObject( $this->initial_vars );
-
- $var_map = array(
- 'ORDERID' => 'order_id',
- 'AMOUNT' => 'amount',
- 'CURRENCYCODE' => 'currency_code',
- 'LANGUAGECODE' => 'language',
- 'COUNTRYCODE' => 'country',
- 'MERCHANTREFERENCE' => 'contribution_tracking_id',
- 'RETURNURL' => 'returnto',
- 'IPADDRESS' => 'server_ip',
- 'ISSUERID' => 'issuer_id',
- 'PAYMENTPRODUCTID' => 'payment_product',
- 'CVV' => 'cvv',
- 'EXPIRYDATE' => 'expiration',
- 'CREDITCARDNUMBER' => 'card_num',
- 'FIRSTNAME' => 'fname',
- 'SURNAME' => 'lname',
- 'STREET' => 'street',
- 'CITY' => 'city',
- 'STATE' => 'state',
- 'ZIP' => 'zip',
- 'EMAIL' => 'email',
- 'ACCOUNTHOLDER' => 'account_holder',
- 'ACCOUNTNAME' => 'account_name',
- 'ACCOUNTNUMBER' => 'account_number',
- 'ADDRESSLINE1E' => 'address_line_1e',
- 'ADDRESSLINE2' => 'address_line_2',
- 'ADDRESSLINE3' => 'address_line_3',
- 'ADDRESSLINE4' => 'address_line_4',
- 'ATTEMPTID' => 'attempt_id',
- 'AUTHORISATIONID' => 'authorization_id',
- 'BANKACCOUNTNUMBER' => 'bank_account_number',
- 'BANKAGENZIA' => 'bank_agenzia',
- 'BANKCHECKDIGIT' => 'bank_check_digit',
- 'BANKCODE' => 'bank_code',
- 'BANKFILIALE' => 'bank_filiale',
- 'BANKNAME' => 'bank_name',
- 'BRANCHCODE' => 'branch_code',
- 'COUNTRYCODEBANK' => 'country_code_bank',
- 'COUNTRYDESCRIPTION' => 'country_description',
- 'CUSTOMERBANKCITY' => 'customer_bank_city',
- 'CUSTOMERBANKSTREET' => 'customer_bank_street',
- 'CUSTOMERBANKNUMBER' => 'customer_bank_number',
- 'CUSTOMERBANKZIP' => 'customer_bank_zip',
- 'DATECOLLECT' => 'date_collect',
- 'DESCRIPTOR' => 'descriptor',
- 'DIRECTDEBITTEXT' => 'direct_debit_text',
- 'DOMICILIO' => 'domicilio',
- 'EFFORTID' => 'effort_id',
- 'IBAN' => 'iban',
- 'IPADDRESSCUSTOMER' => 'user_ip',
- 'PAYMENTREFERENCE' => 'payment_reference',
- 'PROVINCIA' => 'provincia',
- 'SPECIALID' => 'special_id',
- 'SWIFTCODE' => 'swift_code',
- 'TRANSACTIONTYPE' => 'transaction_type',
- 'FISCALNUMBER' => 'fiscal_number',
- );
-
- $this->assertEquals( $var_map, $gateway->getVarMap() );
- }
-
- public function testLanguageStaging() {
- $options = $this->getDonorTestData( 'NO' );
- $options['payment_method'] = 'cc';
- $options['payment_submethod'] = 'visa';
- $gateway = $this->getFreshGatewayObject( $options );
-
- $gateway->_stageData();
-
- $this->assertEquals( $gateway->_getData_Staged( 'language' ),
'no', "'NO' donor's language was inproperly set. Should be 'no'" );
- }
-
- /**
- * Tests to make sure that certain error codes returned from GC will or
- * will not create payments error loglines.
- */
- function testCCLogsOnGatewayError() {
- $init = $this->getDonorTestData( 'US' );
- unset( $init['order_id'] );
- $init['ffname'] = 'cc-vmad';
-
- //this should not throw any payments errors: Just an invalid
card.
- $gateway = $this->getFreshGatewayObject( $init );
- $gateway->setDummyGatewayResponseCode( '430285' );
- $gateway->do_transaction( 'GET_ORDERSTATUS' );
- $this->verifyNoLogErrors( $gateway );
-
- //Now test one we want to throw a payments error
- $gateway = $this->getFreshGatewayObject( $init );
- $gateway->setDummyGatewayResponseCode( '21000050' );
- $gateway->do_transaction( 'GET_ORDERSTATUS' );
- $logline = $this->getGatewayLogMatches( $gateway, LOG_ERR,
'/Investigation required!/' );
- $this->assertType( 'string', $logline, 'GC Error 21000050 is
not generating the expected payments log error' );
-
- //Most irritating version of 20001000 - They failed to enter an
expiration date on GC's form. This should log some specific info, but not an
error.
- $gateway = $this->getFreshGatewayObject( $init );
- $gateway->setDummyGatewayResponseCode( '20001000-expiry' );
- $gateway->do_transaction( 'GET_ORDERSTATUS' );
- $this->verifyNoLogErrors( $gateway );
- $logline = $this->getGatewayLogMatches( $gateway, LOG_INFO,
'/processResponse:.*EXPIRYDATE/' );
- $this->assertType( 'string', $logline, 'GC Error
20001000-expiry is not generating the expected payments log line' );
- }
-
- /**
- * Tests to make sure that certain error codes returned from GC will
- * trigger order cancellation, even if retryable errors also exist.
- * @dataProvider mcNoRetryCodeProvider
- */
- public function testNoMastercardFinesForRepeatOnBadCodes( $code ) {
- $init = $this->getDonorTestData( 'US' );
- unset( $init['order_id'] );
- $init['ffname'] = 'cc-vmad';
- //Make it not look like an orphan
- $this->setMwGlobals( 'wgRequest',
- new FauxRequest( array(
- 'CVVRESULT' => 'M',
- 'AVSRESULT' => '0'
- ), false ) );
-
- //Toxic card should not retry, even if there's an order id
collision
- $gateway = $this->getFreshGatewayObject( $init );
- $gateway->setDummyGatewayResponseCode( $code );
- $gateway->do_transaction( 'Confirm_CreditCard' );
- $this->assertEquals( 1, count( $gateway->curled ), "Gateway
kept trying even with response code $code! MasterCard could fine us a thousand
bucks for that!" );
- $this->assertEquals( 1, count( $gateway->limbo_stomps ),
"Gateway sent no limbostomps for code $code! Should have sent an antimessage!"
);
- $this->assertEquals( true, $gateway->limbo_stomps[0], "Gateway
sent wrong stomp message for code $code! Should have sent an antimessage!" );
- }
-}
->>>>>>> BRANCH (be29ac Merge "Logging changes for DonationInterface")
diff --git
a/tests/includes/Responses/globalcollect/GET_ORDERSTATUS_20001000-expiry.testresponse
b/tests/includes/Responses/globalcollect/GET_ORDERSTATUS_20001000-expiry.testresponse
deleted file mode 100644
index 80f3677..0000000
---
a/tests/includes/Responses/globalcollect/GET_ORDERSTATUS_20001000-expiry.testresponse
+++ /dev/null
@@ -1,47 +0,0 @@
-<!--GET_ORDERSTATUS with the most common error 20001000 cause-->
-<?xml version = "1.0"?>
-<XML>
- <REQUEST>
- <ACTION>GET_ORDERSTATUS</ACTION>
- <META>
- <MERCHANTID>test</MERCHANTID>
- <IPADDRESS>127.0.0.1</IPADDRESS>
- <VERSION>2.0</VERSION>
- </META>
- <PARAMS>
- <ORDER>
- <ORDERID>1234567890</ORDERID>
- <EFFORTID>1</EFFORTID>
- </ORDER>
- </PARAMS>
- <RESPONSE>
- <RESULT>OK</RESULT>
- <META>
- <REQUESTID>1234567</REQUESTID>
-
<RESPONSEDATETIME>20141203003328</RESPONSEDATETIME>
- </META>
- <STATUS>
- <STATUSDATE>20141203003328</STATUSDATE>
- <PAYMENTMETHODID>1</PAYMENTMETHODID>
-
<MERCHANTREFERENCE>14222.39313</MERCHANTREFERENCE>
- <ATTEMPTID>1</ATTEMPTID>
- <PAYMENTREFERENCE>0</PAYMENTREFERENCE>
- <AMOUNT>2000</AMOUNT>
- <MERCHANTID>6570</MERCHANTID>
- <ORDERID>1234567890</ORDERID>
- <STATUSID>100</STATUSID>
-
<CREDITCARDNUMBER>************2105</CREDITCARDNUMBER>
- <EFFORTID>1</EFFORTID>
- <CURRENCYCODE>USD</CURRENCYCODE>
- <PAYMENTPRODUCTID>3</PAYMENTPRODUCTID>
- <ERRORS>
- <ERROR>
- <TYPE>S</TYPE>
- <CODE>20001000</CODE>
- <MESSAGE>20001000 REQUEST
1234567 NULL VALUE NOT ALLOWED FOR EXPIRYDATE</MESSAGE>
- </ERROR>
- </ERRORS>
- </STATUS>
- </RESPONSE>
- </REQUEST>
-</XML>
--
To view, visit https://gerrit.wikimedia.org/r/178357
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I54b3622aba48d2b1312337b901a539097235cae9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: deployment
Gerrit-Owner: Katie Horn <[email protected]>
Gerrit-Reviewer: Katie Horn <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
