Ejegg has submitted this change and it was merged.
Change subject: Merge branch 'master' into deployment
......................................................................
Merge branch 'master' into deployment
And update vendor submodule
53f9122 WPG RECON
cf60388 Allow for multiple audit files per date
8012dae Respect individual gateway test_mode settings
3059cff Audit: stop prepending 'RFD ' to gateway refund IDs
Change-Id: I5731a725f551e1d5bb6ec83c1fefbe4b7fc16fc1
---
D sites/all/modules/wmf_audit/tests/AstroPayAuditTest.php
M vendor
2 files changed, 0 insertions(+), 220 deletions(-)
Approvals:
Ejegg: Looks good to me, approved
diff --git a/sites/all/modules/wmf_audit/tests/AstroPayAuditTest.php
b/sites/all/modules/wmf_audit/tests/AstroPayAuditTest.php
deleted file mode 100644
index 4a141a7..0000000
--- a/sites/all/modules/wmf_audit/tests/AstroPayAuditTest.php
+++ /dev/null
@@ -1,220 +0,0 @@
-<<<<<<< HEAD (ba39f3 Merge branch 'master' into deployment)
-=======
-<?php
-
-function astropay_audit_watchdog( $entry ) {
- AstroPayAuditTest::receiveLogline( $entry );
-}
-
-/**
- * @group AstroPay
- * @group WmfAudit
- */
-class AstroPayAuditTest extends BaseWmfDrupalPhpUnitTestCase {
- static protected $messages;
- static protected $loglines;
-
- protected $contact_id;
- protected $contribution_id;
-
- public static function getInfo() {
- return array(
- 'name' => 'AstroPay Audit',
- 'group' => 'Audit',
- 'description' => 'Parse audit files and match with
logs.',
- );
- }
-
- public function setUp() {
- parent::setUp();
- self::$messages = array();
- $dirs = array(
- 'wmf_audit_log_archive_dir' => __DIR__ . '/data/logs/',
- 'astropay_audit_recon_completed_dir' =>
'/tmp/test-completed/',
- 'astropay_audit_working_log_dir' =>
'/tmp/test-working/',
- );
-
- foreach ( $dirs as $var => $dir ) {
- if ( !is_dir( $dir ) ) {
- mkdir( $dir );
- }
- variable_set( $var, $dir );
- }
-
- $old_working = glob( $dirs['astropay_audit_working_log_dir'] .
'*' );
- foreach ( $old_working as $zap ) {
- if ( is_file( $zap ) ) {
- unlink( $zap );
- }
- }
-
- variable_set( 'astropay_audit_log_search_past_days', 7 );
-
- // Fakedb doesn't fake the original txn for refunds, so add one
here
- // First we need to set an exchange rate for a sickeningly
specific time
- $this->setExchangeRates( 1434488406, array( 'BRL' => 3.24 ) );
- $this->setExchangeRates( 1434488406, array( 'USD' => 1 ) );
- $existing = wmf_civicrm_get_contributions_from_gateway_id(
'astropay', '5138333' );
- if ( $existing ) {
- // Previous test run may have crashed before cleaning up
- $contribution = $existing[0];
- } else {
- $msg = array(
- 'contribution_tracking_id' => 2476135333,
- 'currency' => 'BRL',
- 'date' => 1434488406,
- 'email' => '[email protected]',
- 'gateway' => 'ASTROPAY',
- 'gateway_txn_id' => '5138333',
- 'gross' => 5.00,
- 'payment_method' => 'cc',
- 'payment_submethod' => 'mc',
- );
- $contribution =
wmf_civicrm_contribution_message_import( $msg );
- }
- $this->contact_id = $contribution['contact_id'];
- $this->contribution_id = $contribution['id'];
- }
-
- public function tearDown() {
- $api = civicrm_api_classapi();
- $api->Contribution->Delete( array(
- 'id' => $this->contribution_id,
-
- 'version' => 3,
- ) );
- $api->Contact->Delete( array(
- 'id' => $this->contact_id,
-
- 'version' => 3,
- ) );
- parent::tearDown();
- }
-
- public function auditTestProvider() {
- return array(
- array( __DIR__ . '/data/AstroPay/donation/', array(
- 'main' => array(
- array(
- 'contribution_tracking_id' =>
'26683111',
- 'country' => 'BR',
- 'currency' => 'BRL',
- 'date' => 1434477552,
- 'email' =>
'[email protected]',
- 'first_name' => 'Test',
- 'gateway' => 'astropay',
- 'gateway_txn_id' => '5258111',
- 'gross' => '5',
- 'language' => 'en',
- 'last_name' => 'Person',
- 'payment_method' => 'cc',
- 'payment_submethod' => 'mc',
- 'referrer' =>
'https://mail.google.com/mail/u/0/?pli=1',
- 'settled_currency' => 'USD',
- 'settled_date' => 1434477632,
- 'settled_fee' => '0.03',
- 'settled_gross' => '1.50',
- 'user_ip' => '1.2.3.4',
- 'utm_campaign' =>
'astropay_audit',
- 'utm_medium' =>
'astropay_audit',
- 'utm_source' => '..cc',
- ),
- ),
- ), array() ),
- array( __DIR__ . '/data/AstroPay/bt/', array(
- 'main' => array(
- array(
- 'contribution_tracking_id' =>
'2476135999',
- 'country' => 'BR',
- 'currency' => 'BRL',
- 'date' => 1434506370,
- 'email' => '[email protected]',
- 'first_name' => 'Jimmy',
- 'gateway' => 'astropay',
- 'gateway_txn_id' => '5258777',
- 'gross' => '4',
- 'language' => 'en',
- 'last_name' => 'Bankster',
- 'payment_method' => 'bt',
- 'payment_submethod' =>
'bradesco',
- 'referrer' =>
'https://banketybank.com',
- 'settled_currency' => 'USD',
- 'settled_date' => 1434506459,
- 'settled_fee' => '0.03',
- 'settled_gross' => '1.20',
- 'user_ip' => '8.8.8.8',
- 'utm_campaign' =>
'astropay_audit',
- 'utm_medium' =>
'astropay_audit',
- 'utm_source' => '..bt',
- ),
- ),
- ), array() ),
- array( __DIR__ . '/data/AstroPay/refund/', array(
- 'negative' => array(
- array(
- 'date' => 1434488406,
- 'gateway' => 'astropay',
- 'gateway_parent_id' =>
'5138333',
- 'gateway_refund_id' => '33333',
- 'gross' => '5.00',
- 'gross_currency' => 'BRL',
- 'type' => 'refund',
- ),
- ),
- ), array() ),
- );
- }
-
- /**
- * @dataProvider auditTestProvider
- */
- public function testParseFiles( $path, $expectedMessages,
$expectedLoglines ) {
- variable_set( 'astropay_audit_recon_files_dir', $path );
-
- $this->runAuditor();
-
- $this->assertEquals( $expectedMessages, self::$messages );
- $this->assertLoglinesPresent( $expectedLoglines );
- }
-
- protected function runAuditor() {
- $options = array(
- 'fakedb' => true,
- 'quiet' => true,
- 'test' => true,
- 'test_callback' => array( 'AstroPayAuditTest',
'receiveMessages' ),
- #'verbose' => 'true', # Uncomment to debug.
- );
- $audit = new AstroPayAuditProcessor( $options );
- $audit->run();
- }
-
- protected function assertLoglinesPresent( $expectedLines ) {
- $notFound = array();
-
- foreach ( $expectedLines as $expectedEntry ) {
- foreach ( self::$loglines as $entry ) {
- if ( $entry['type'] === $expectedEntry['type']
- && $entry['message'] ===
$expectedEntry['message'] )
- {
- // Skip to next expected line.
- continue 2;
- }
- }
- // Not found.
- $notFound[] = $expectedEntry;
- }
- if ( $notFound ) {
- $this->fail( "Did not see these loglines, " .
json_encode( $notFound ) );
- }
- }
-
- static public function receiveMessages( $msg, $type ) {
- self::$messages[$type][] = $msg;
- }
-
- static public function receiveLogline( $entry ) {
- self::$loglines[] = $entry;
- }
-}
->>>>>>> BRANCH (3059cf Audit: stop prepending 'RFD ' to gateway refund IDs)
diff --git a/vendor b/vendor
index d1f6b28..30f1855 160000
--- a/vendor
+++ b/vendor
-Subproject commit d1f6b2840fc7a7b72e4a5a687f38f20e7ee6126a
+Subproject commit 30f1855c7c261330acaa3a86e5920a33e6aed6cc
--
To view, visit https://gerrit.wikimedia.org/r/246411
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5731a725f551e1d5bb6ec83c1fefbe4b7fc16fc1
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg <[email protected]>
Gerrit-Reviewer: Ejegg <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
