jenkins-bot has submitted this change and it was merged.
Change subject: Merge branch 'master' into deployment
......................................................................
Merge branch 'master' into deployment
7aea2f6 Add another freaky Alipay audit exception
403df17 Fix html_type on year rollup wmf_donor fields
b25c1e5 obsessive safety checks
80cfed8 Reinstate some missing schema upgrades
Change-Id: I8cb9ccd725eaf35ade5f0f9db5bebd98dd094def
---
D sites/all/modules/wmf_common/tests/phpunit/WmfTransactionTest.php
1 file changed, 0 insertions(+), 166 deletions(-)
Approvals:
Ejegg: Looks good to me, approved
jenkins-bot: Verified
diff --git a/sites/all/modules/wmf_common/tests/phpunit/WmfTransactionTest.php
b/sites/all/modules/wmf_common/tests/phpunit/WmfTransactionTest.php
deleted file mode 100644
index e4a8de7..0000000
--- a/sites/all/modules/wmf_common/tests/phpunit/WmfTransactionTest.php
+++ /dev/null
@@ -1,166 +0,0 @@
-<<<<<<< HEAD (4fa10e Merge branch 'master' into deployment)
-=======
-<?php
-
-class WmfTransactionTestCase extends BaseWmfDrupalPhpUnitTestCase {
- public function testParseUniqueId() {
- $transaction = WmfTransaction::from_unique_id( "RFD RECURRING
GLOBALCOLLECT 1234 432" );
- $this->assertEquals(
- $transaction->gateway_txn_id, "1234",
- "5-argument form gateway_txn_id is parsed correctly." );
- $this->assertEquals(
- true, $transaction->is_refund,
- "refund flag parsed" );
- $this->assertEquals(
- true, $transaction->is_recurring,
- "recurring flag parsed" );
- $this->assertEquals(
- "globalcollect", strtolower( $transaction->gateway ),
- "gateway is correctly parsed" );
- $this->assertEquals(
- "432", $transaction->timestamp,
- "timestamp is correctly parsed" );
- $this->assertEquals(
- $transaction->get_unique_id(), "RFD RECURRING GLOBALCOLLECT 1234",
- "5-argument form is renormalized to 4-form" );
-
- $transaction = WmfTransaction::from_unique_id( "RFD GLOBALCOLLECT 1234
432" );
- $this->assertEquals(
- $transaction->gateway_txn_id, "1234",
- "4-argument form gateway_txn_id is parsed correctly." );
- $this->assertEquals(
- true, $transaction->is_refund,
- "refund flag parsed" );
- $this->assertEquals(
- "432", $transaction->timestamp,
- "timestamp is correctly parsed" );
- $this->assertEquals(
- $transaction->get_unique_id(), "RFD GLOBALCOLLECT 1234",
- "4-argument form is renormalized correctly" );
-
- $transaction = WmfTransaction::from_unique_id( "GLOBALCOLLECT 1234x
432" );
- $this->assertEquals(
- $transaction->gateway_txn_id, "1234x",
- "3-argument form gateway_txn_id is parsed correctly." );
- $this->assertEquals(
- $transaction->get_unique_id(), strtoupper( "GLOBALCOLLECT 1234x" ),
- "3-argument form is renormalized correctly" );
-
- $transaction = WmfTransaction::from_unique_id( "GLOBALCOLLECT 1234" );
- $this->assertEquals(
- $transaction->gateway_txn_id, "1234",
- "2-argument form gateway_txn_id is parsed correctly." );
- $this->assertNull( $transaction->timestamp,
- "timestamp is not unnecessarily invented" );
- }
-
- public function testParseMessage() {
- $msg = array(
- 'gateway' => "globalcollect",
- 'gateway_txn_id' => "1234",
- 'recurring' => null,
- );
- $transaction = WmfTransaction::from_message( $msg );
- $this->assertEquals(
- "1234", $transaction->gateway_txn_id,
- "parsed message gateway_txn_id is correct" );
- $this->assertEquals( 1,
- preg_match( "/GLOBALCOLLECT 1234/", $transaction->get_unique_id()
),
- "parsed message has correct trxn_id" );
- }
-
- /**
- * @expectedException WmfException
- * @expectedExceptionCode INVALID_MESSAGE
- */
- function testInvalidEmptyId() {
- $transaction = WmfTransaction::from_unique_id( "" );
- }
-
- /**
- * @expectedException WmfException
- * @expectedExceptionCode INVALID_MESSAGE
- */
- function testInvalidAlmostEmptyId() {
- $transaction = WmfTransaction::from_unique_id( 'RFD RECURRING' );
- }
-
- /**
- * @expectedException WmfException
- * @expectedExceptionCode INVALID_MESSAGE
- */
- function testInvalidWhitespaceId() {
- $transaction = WmfTransaction::from_unique_id( 'RFD RECURRING ' );
- }
-
- /**
- * @expectedException WmfException
- * @expectedExceptionCode INVALID_MESSAGE
- */
- function testInvalidExtraPartsId() {
- $transaction = WmfTransaction::from_unique_id( 'TEST_GATEWAY 123 1234
EXTRA_PART' );
- }
-
- /**
- * @expectedException WmfException
- * @expectedExceptionCode INVALID_MESSAGE
- */
- function testInvalidTimestampId() {
- $transaction = WmfTransaction::from_unique_id( 'TEST_GATEWAY 123
BAD_TIMESTAMP' );
- }
-
- function testExistsNone() {
- $transaction = WmfTransaction::from_unique_id( 'TEST_GATEWAY ' .
mt_rand() );
- $this->assertEquals( false, $transaction->exists() );
- }
-
- function testExistsOne() {
- $gateway_txn_id = mt_rand();
- $msg = array(
- 'gross' => 1,
- 'currency' => 'USD',
- 'gateway' => 'TEST_GATEWAY',
- 'gateway_txn_id' => $gateway_txn_id,
- 'payment_method' => 'cc',
- 'email' => 'nob...@wikimedia.org',
- );
- wmf_civicrm_contribution_message_import( $msg );
- $transaction = WmfTransaction::from_unique_id( 'TEST_GATEWAY ' .
$gateway_txn_id );
- $this->assertEquals( true, $transaction->exists() );
- }
-
- /**
- * @expectedException NonUniqueTransaction
- */
- function testGetContributionMany() {
- $gateway_txn_id = mt_rand();
- $api = civicrm_api_classapi();
- $api->Contact->create( array(
- 'contact_type' => 'Individual',
- 'display_name' => 'test',
- 'version' => 3,
- ) );
- $params = array(
- 'contact_id' => $api->values[0]->id,
- 'contribution_type' => 'Cash',
- 'total_amount' => 1,
- 'version' => 3,
- );
- $ret = $api->Contribution->create( $params );
- $this->assertTrue( $ret );
- wmf_civicrm_set_custom_field_values( $api->values[0]->id, array(
- 'gateway' => 'TEST_GATEWAY',
- 'gateway_txn_id' => $gateway_txn_id,
- ) );
- $ret = $api->Contribution->create( $params );
- $this->assertTrue( $ret );
- wmf_civicrm_set_custom_field_values( $api->values[0]->id, array(
- 'gateway' => 'TEST_GATEWAY',
- 'gateway_txn_id' => $gateway_txn_id,
- ) );
-
- $transaction = WmfTransaction::from_unique_id( 'TEST_GATEWAY ' .
$gateway_txn_id );
- $transaction->getContribution();
- }
-}
->>>>>>> BRANCH (e22644 Merge "Fix html_type on year rollup wmf_donor fields")
--
To view, visit https://gerrit.wikimedia.org/r/187134
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8cb9ccd725eaf35ade5f0f9db5bebd98dd094def
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
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
