[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/399185 )

Change subject: Merge branch 'master' into deployment
..


Merge branch 'master' into deployment

91352b2 T183153: Removed Prometheus duplicate key output from DonationStats
f50237c Apply drupal formatting to AntifraudQueueConsumer.php
6fe8564 Extend risk score limiting to cover components of the score
aa0c142 Top out risk score at 100 million.
389ac7c Better requeue on db locks

Change-Id: Ie3b730f4b9fdc5c981f1ccc1eeb03d8c28d21473
---
M sites/all/modules/queue2civicrm/fredge/AntifraudQueueConsumer.php
D sites/all/modules/queue2civicrm/tests/phpunit/AntifraudQueueTest.php
D sites/all/modules/queue2civicrm/tests/phpunit/DonationStatsTest.php
3 files changed, 0 insertions(+), 372 deletions(-)

Approvals:
  jenkins-bot: Verified
  Ejegg: Looks good to me, approved



diff --git a/sites/all/modules/queue2civicrm/fredge/AntifraudQueueConsumer.php 
b/sites/all/modules/queue2civicrm/fredge/AntifraudQueueConsumer.php
index 8a7b88c..a0aa736 100644
--- a/sites/all/modules/queue2civicrm/fredge/AntifraudQueueConsumer.php
+++ b/sites/all/modules/queue2civicrm/fredge/AntifraudQueueConsumer.php
@@ -75,53 +75,6 @@
 $id = 0;
 $inserting = TRUE;
 
-<<< HEAD   (42a65d Revert "Reset deploy branch to match production")
-   $dbs = wmf_civicrm_get_dbs();
-   $dbs->push( 'fredge' );
-   $query = 'SELECT id FROM payments_fraud WHERE 
contribution_tracking_id = :ct_id AND order_id = :order_id LIMIT 1';
-   $result = db_query( $query, array(
-   ':ct_id' => $msg['contribution_tracking_id'],
-   ':order_id' => $msg['order_id']
-   ) );
-   if ( $result->rowCount() === 1 ) {
-   $id = $result->fetch()->id;
-   $inserting = false;
-   }
-   $data = fredge_prep_data( $msg, 'payments_fraud', 
$logIdentifier, $inserting );
-   //now all you have to do is insert the actual message data.
-   if ( $inserting ) {
-   $id = db_insert( 'payments_fraud' )
-   ->fields( $data )
-   ->execute();
-   } else {
-   db_update( 'payments_fraud' )
-   ->fields( $data )
-   ->condition( 'id', $id )
-   ->execute();
-   }
-   if ( $id ) {
-   foreach ( $msg['score_breakdown'] as $test => $score ) {
- if ($score > 1) {
-   $score = 1;
-}
-   $breakdown = array(
-   'payments_fraud_id' => $id,
-   'filter_name' => $test,
-   'risk_score' => $score,
-   );
-   // validate the data. none of these fields 
would be converted, so no need
-   // to store the output
-   fredge_prep_data( $breakdown, 
'payments_fraud_breakdown', $logIdentifier, true );
-   db_merge( 'payments_fraud_breakdown' )->key( 
array(
-   'payments_fraud_id' => $id,
-   'filter_name' => $test,
-   ) )->fields( array(
-   'risk_score' => $score,
-   ) )->execute();
-   }
-   }
-   }
-===
 $dbs = wmf_civicrm_get_dbs();
 $dbs->push('fredge');
 $query = 'SELECT id FROM payments_fraud WHERE contribution_tracking_id = 
:ct_id AND order_id = :order_id LIMIT 1';
@@ -168,5 +121,4 @@
   }
 }
   }
->>> BRANCH (91352b T183153: Removed Prometheus duplicate key output from 
Donati)
 }
diff --git 
a/sites/all/modules/queue2civicrm/tests/phpunit/AntifraudQueueTest.php 
b/sites/all/modules/queue2civicrm/tests/phpunit/AntifraudQueueTest.php
deleted file mode 100644
index 03284e1..000
--- a/sites/all/modules/queue2civicrm/tests/phpunit/AntifraudQueueTest.php
+++ /dev/null
@@ -1,152 +0,0 @@
-<<< HEAD   (42a65d Revert "Reset deploy branch to match production")
-===
-consumer = new AntifraudQueueConsumer(
-   'payments-antifraud'
-   );
-   }
-
-   public function testValidMessage() {
-   $message = json_decode(
-   file_get_contents( __DIR__ . 
'/../data/payments-antifraud.json'),
-   true
-   );
-   $ctId = mt_rand();
-   $oId = $ctId . '.0';
-   $message['contribution_tracking_id'] = $ctId;

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

[Jgleeson (Code Review)]

Jgleeson has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/399185 )

Change subject: Merge branch 'master' into deployment
..

Merge branch 'master' into deployment

91352b2 T183153: Removed Prometheus duplicate key output from DonationStats
f50237c Apply drupal formatting to AntifraudQueueConsumer.php
6fe8564 Extend risk score limiting to cover components of the score
aa0c142 Top out risk score at 100 million.
389ac7c Better requeue on db locks

Change-Id: Ie3b730f4b9fdc5c981f1ccc1eeb03d8c28d21473
---
M sites/all/modules/queue2civicrm/fredge/AntifraudQueueConsumer.php
D sites/all/modules/queue2civicrm/tests/phpunit/AntifraudQueueTest.php
D sites/all/modules/queue2civicrm/tests/phpunit/DonationStatsTest.php
3 files changed, 0 insertions(+), 372 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/85/399185/1

diff --git a/sites/all/modules/queue2civicrm/fredge/AntifraudQueueConsumer.php 
b/sites/all/modules/queue2civicrm/fredge/AntifraudQueueConsumer.php
index 8a7b88c..a0aa736 100644
--- a/sites/all/modules/queue2civicrm/fredge/AntifraudQueueConsumer.php
+++ b/sites/all/modules/queue2civicrm/fredge/AntifraudQueueConsumer.php
@@ -75,53 +75,6 @@
 $id = 0;
 $inserting = TRUE;
 
-<<< HEAD   (42a65d Revert "Reset deploy branch to match production")
-   $dbs = wmf_civicrm_get_dbs();
-   $dbs->push( 'fredge' );
-   $query = 'SELECT id FROM payments_fraud WHERE 
contribution_tracking_id = :ct_id AND order_id = :order_id LIMIT 1';
-   $result = db_query( $query, array(
-   ':ct_id' => $msg['contribution_tracking_id'],
-   ':order_id' => $msg['order_id']
-   ) );
-   if ( $result->rowCount() === 1 ) {
-   $id = $result->fetch()->id;
-   $inserting = false;
-   }
-   $data = fredge_prep_data( $msg, 'payments_fraud', 
$logIdentifier, $inserting );
-   //now all you have to do is insert the actual message data.
-   if ( $inserting ) {
-   $id = db_insert( 'payments_fraud' )
-   ->fields( $data )
-   ->execute();
-   } else {
-   db_update( 'payments_fraud' )
-   ->fields( $data )
-   ->condition( 'id', $id )
-   ->execute();
-   }
-   if ( $id ) {
-   foreach ( $msg['score_breakdown'] as $test => $score ) {
- if ($score > 1) {
-   $score = 1;
-}
-   $breakdown = array(
-   'payments_fraud_id' => $id,
-   'filter_name' => $test,
-   'risk_score' => $score,
-   );
-   // validate the data. none of these fields 
would be converted, so no need
-   // to store the output
-   fredge_prep_data( $breakdown, 
'payments_fraud_breakdown', $logIdentifier, true );
-   db_merge( 'payments_fraud_breakdown' )->key( 
array(
-   'payments_fraud_id' => $id,
-   'filter_name' => $test,
-   ) )->fields( array(
-   'risk_score' => $score,
-   ) )->execute();
-   }
-   }
-   }
-===
 $dbs = wmf_civicrm_get_dbs();
 $dbs->push('fredge');
 $query = 'SELECT id FROM payments_fraud WHERE contribution_tracking_id = 
:ct_id AND order_id = :order_id LIMIT 1';
@@ -168,5 +121,4 @@
   }
 }
   }
->>> BRANCH (91352b T183153: Removed Prometheus duplicate key output from 
Donati)
 }
diff --git 
a/sites/all/modules/queue2civicrm/tests/phpunit/AntifraudQueueTest.php 
b/sites/all/modules/queue2civicrm/tests/phpunit/AntifraudQueueTest.php
deleted file mode 100644
index 03284e1..000
--- a/sites/all/modules/queue2civicrm/tests/phpunit/AntifraudQueueTest.php
+++ /dev/null
@@ -1,152 +0,0 @@
-<<< HEAD   (42a65d Revert "Reset deploy branch to match production")
-===
-consumer = new AntifraudQueueConsumer(
-   'payments-antifraud'
-   );
-   }
-
-   public function testValidMessage() {
-   $message = json_decode(
-   file_get_contents( __DIR__ . 
'/../data/payments-antifraud.json'),
-   true
-   );
-   $ctId = mt_rand();
-   $oId = $ctId . '.0';
-   

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/398336 )

Change subject: Merge branch 'master' into deployment
..


Merge branch 'master' into deployment

Update CiviCRM submodule

Change-Id: I93f33f2ebdad62baf445e8b7177b612d4a280292
---
0 files changed, 0 insertions(+), 0 deletions(-)

Approvals:
  jenkins-bot: Verified
  Ejegg: Looks good to me, approved




-- 
To view, visit https://gerrit.wikimedia.org/r/398336
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I93f33f2ebdad62baf445e8b7177b612d4a280292
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

[Ejegg (Code Review)]

Ejegg has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/398336 )

Change subject: Merge branch 'master' into deployment
..

Merge branch 'master' into deployment

Update CiviCRM submodule

Change-Id: I93f33f2ebdad62baf445e8b7177b612d4a280292
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/36/398336/1


-- 
To view, visit https://gerrit.wikimedia.org/r/398336
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I93f33f2ebdad62baf445e8b7177b612d4a280292
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/391990 )

Change subject: Merge branch 'master' into deployment
..


Merge branch 'master' into deployment

91626c731 Get rid of 'qqq' TY subject, link zh to zh-hans

Change-Id: I705f2d650612c108ba198906521940f75876d016
---
0 files changed, 0 insertions(+), 0 deletions(-)

Approvals:
  jenkins-bot: Verified
  Ejegg: Looks good to me, approved




-- 
To view, visit https://gerrit.wikimedia.org/r/391990
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I705f2d650612c108ba198906521940f75876d016
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

[Ejegg (Code Review)]

Ejegg has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/391990 )

Change subject: Merge branch 'master' into deployment
..

Merge branch 'master' into deployment

91626c731 Get rid of 'qqq' TY subject, link zh to zh-hans

Change-Id: I705f2d650612c108ba198906521940f75876d016
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/90/391990/1


-- 
To view, visit https://gerrit.wikimedia.org/r/391990
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I705f2d650612c108ba198906521940f75876d016
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/391981 )

Change subject: Merge branch 'master' into deployment
..


Merge branch 'master' into deployment

face89d71 Remove useless subject line setting
43f82b750 Don't create CiviMail mailing record in make_thank_you
37edc27b3 Add thank you subject generator
0f491988a Add thank you email subject templates
4164a0a31 Get thank you email subject from template files

Change-Id: Ieaf8af09a30e585693309ab49c5a66c2394f779e
---
D sites/all/modules/thank_you/tests/phpunit/ThankYouTest.php
1 file changed, 0 insertions(+), 169 deletions(-)

Approvals:
  jenkins-bot: Verified
  Ejegg: Looks good to me, approved



diff --git a/sites/all/modules/thank_you/tests/phpunit/ThankYouTest.php 
b/sites/all/modules/thank_you/tests/phpunit/ThankYouTest.php
deleted file mode 100644
index 3379d50..000
--- a/sites/all/modules/thank_you/tests/phpunit/ThankYouTest.php
+++ /dev/null
@@ -1,169 +0,0 @@
-<<< HEAD   (899871 Remove vendor from deploy branch .gitignore)
-===
-message = array(
-   'city' => 'Somerville',
-   'country' => 'US',
-   'currency' => 'USD',
-   'date' => time(),
-   'email' => 'generousdo...@example.org',
-   'first_name' => 'Test',
-   'last_name' => 'Es',
-   'language' => 'en',
-   'gateway' => 'test_gateway',
-   'gateway_txn_id' => mt_rand(),
-   'gross' => '1.23',
-   'payment_method' => 'cc',
-   'postal_code' => '02144',
-   'state_province' => 'MA',
-   'street_address' => '1 Davis Square',
-   );
-   $this->old_civimail = variable_get( 
'thank_you_add_civimail_records', 'false' );
-   $this->old_civimail_rate = variable_get( 
'thank_you_civimail_rate', 1.0 );
-
-   $contribution = wmf_civicrm_contribution_message_import( 
$this->message );
-
-   $this->contact_id = $contribution['contact_id'];
-   $this->contribution_id = $contribution['id'];
-   }
-
-   public function tearDown() {
-   parent::cleanUpContact( $this->contact_id );
-   variable_set( 'thank_you_add_civimail_records', 
$this->old_civimail );
-   variable_get( 'thank_you_civimail_rate', 
$this->old_civimail_rate );
-   parent::tearDown();
-   }
-
-   /**
-* FIXME: This test has to be first, because we have to make sure
-*  those tags exist before anyone calls the helper function, which
-*  stashes stuff in a function-level staticvar
-*
-* @throws \CiviCRM_API3_Exception
-*/
-   public function testGetEntityTagDetail() {
-   $tag1 = $this->ensureTagExists( 'smurfy' );
-   $tag2 = $this->ensureTagExists( 'smurfalicious' );
-
-   $this->callAPISuccess(
-   'EntityTag',
-   'create',
-   array(
-   'entity_id' => $this->contribution_id,
-   'entity_table' => 'civicrm_contribution',
-   'tag_id' => 'smurfy'
-   )
-   );
-   $this->callAPISuccess(
-   'EntityTag',
-   'create',
-   array(
-   'entity_id' => $this->contribution_id,
-   'entity_table' => 'civicrm_contribution',
-   'tag_id' => 'smurfalicious'
-   )
-   );
-
-   $smurfiestTags = wmf_thank_you_get_tag_names( 
$this->contribution_id );
-   $this->assertEquals( array( 'smurfy', 'smurfalicious' ), 
$smurfiestTags );
-
-   $this->callAPISuccess( 'Tag', 'delete', array( 'id' => $tag1 ) 
);
-   $this->callAPISuccess( 'Tag', 'delete', array( 'id' => $tag2 ) 
);
-   }
-
-   public function testSendThankYou() {
-   variable_set( 'thank_you_add_civimail_records', 'false' );
-   $result = thank_you_for_contribution( $this->contribution_id );
-   $this->assertTrue( $result );
-   $this->assertEquals( 1, TestMailer::countMailings() );
-   $sent = TestMailer::getMailing( 0 );
-   $this->assertEquals( $this->message['email'], 
$sent['to_address'] );
-   $this->assertEquals(
-   "{$this->message['first_name']} 
{$this->message['last_name']}",
-   $sent['to_name']
-   );
-   $expectedBounce = 
"ty.{$this->contact_id}.{$this->contribution_id}" .
-

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

[Ejegg (Code Review)]

Ejegg has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/391981 )

Change subject: Merge branch 'master' into deployment
..

Merge branch 'master' into deployment

face89d71 Remove useless subject line setting
43f82b750 Don't create CiviMail mailing record in make_thank_you
37edc27b3 Add thank you subject generator
0f491988a Add thank you email subject templates
4164a0a31 Get thank you email subject from template files

Change-Id: Ieaf8af09a30e585693309ab49c5a66c2394f779e
---
D sites/all/modules/thank_you/tests/phpunit/ThankYouTest.php
1 file changed, 0 insertions(+), 169 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/81/391981/1

diff --git a/sites/all/modules/thank_you/tests/phpunit/ThankYouTest.php 
b/sites/all/modules/thank_you/tests/phpunit/ThankYouTest.php
deleted file mode 100644
index 3379d50..000
--- a/sites/all/modules/thank_you/tests/phpunit/ThankYouTest.php
+++ /dev/null
@@ -1,169 +0,0 @@
-<<< HEAD   (899871 Remove vendor from deploy branch .gitignore)
-===
-message = array(
-   'city' => 'Somerville',
-   'country' => 'US',
-   'currency' => 'USD',
-   'date' => time(),
-   'email' => 'generousdo...@example.org',
-   'first_name' => 'Test',
-   'last_name' => 'Es',
-   'language' => 'en',
-   'gateway' => 'test_gateway',
-   'gateway_txn_id' => mt_rand(),
-   'gross' => '1.23',
-   'payment_method' => 'cc',
-   'postal_code' => '02144',
-   'state_province' => 'MA',
-   'street_address' => '1 Davis Square',
-   );
-   $this->old_civimail = variable_get( 
'thank_you_add_civimail_records', 'false' );
-   $this->old_civimail_rate = variable_get( 
'thank_you_civimail_rate', 1.0 );
-
-   $contribution = wmf_civicrm_contribution_message_import( 
$this->message );
-
-   $this->contact_id = $contribution['contact_id'];
-   $this->contribution_id = $contribution['id'];
-   }
-
-   public function tearDown() {
-   parent::cleanUpContact( $this->contact_id );
-   variable_set( 'thank_you_add_civimail_records', 
$this->old_civimail );
-   variable_get( 'thank_you_civimail_rate', 
$this->old_civimail_rate );
-   parent::tearDown();
-   }
-
-   /**
-* FIXME: This test has to be first, because we have to make sure
-*  those tags exist before anyone calls the helper function, which
-*  stashes stuff in a function-level staticvar
-*
-* @throws \CiviCRM_API3_Exception
-*/
-   public function testGetEntityTagDetail() {
-   $tag1 = $this->ensureTagExists( 'smurfy' );
-   $tag2 = $this->ensureTagExists( 'smurfalicious' );
-
-   $this->callAPISuccess(
-   'EntityTag',
-   'create',
-   array(
-   'entity_id' => $this->contribution_id,
-   'entity_table' => 'civicrm_contribution',
-   'tag_id' => 'smurfy'
-   )
-   );
-   $this->callAPISuccess(
-   'EntityTag',
-   'create',
-   array(
-   'entity_id' => $this->contribution_id,
-   'entity_table' => 'civicrm_contribution',
-   'tag_id' => 'smurfalicious'
-   )
-   );
-
-   $smurfiestTags = wmf_thank_you_get_tag_names( 
$this->contribution_id );
-   $this->assertEquals( array( 'smurfy', 'smurfalicious' ), 
$smurfiestTags );
-
-   $this->callAPISuccess( 'Tag', 'delete', array( 'id' => $tag1 ) 
);
-   $this->callAPISuccess( 'Tag', 'delete', array( 'id' => $tag2 ) 
);
-   }
-
-   public function testSendThankYou() {
-   variable_set( 'thank_you_add_civimail_records', 'false' );
-   $result = thank_you_for_contribution( $this->contribution_id );
-   $this->assertTrue( $result );
-   $this->assertEquals( 1, TestMailer::countMailings() );
-   $sent = TestMailer::getMailing( 0 );
-   $this->assertEquals( $this->message['email'], 
$sent['to_address'] );
-   $this->assertEquals(
-   "{$this->message['first_name']} 
{$this->message['last_name']}",
-   $sent['to_name']
-   );
-   $expectedBounce = 
"ty.{$this->contact_id}.{$this->contribution_id}" .
-  

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/391916 )

Change subject: Merge branch 'master' into deployment
..


Merge branch 'master' into deployment

0afb394 Update donation-interface with debug code for orphanslayer

Change-Id: I2f4d0927731ee9e12c7b1d8e5f0136c921cfe0f6
---
0 files changed, 0 insertions(+), 0 deletions(-)

Approvals:
  Mepps: Looks good to me, approved
  jenkins-bot: Verified




-- 
To view, visit https://gerrit.wikimedia.org/r/391916
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I2f4d0927731ee9e12c7b1d8e5f0136c921cfe0f6
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Mepps 
Gerrit-Reviewer: Mepps 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

[Mepps (Code Review)]

Mepps has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/391916 )

Change subject: Merge branch 'master' into deployment
..

Merge branch 'master' into deployment

0afb394 Update donation-interface with debug code for orphanslayer

Change-Id: I2f4d0927731ee9e12c7b1d8e5f0136c921cfe0f6
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/16/391916/1


-- 
To view, visit https://gerrit.wikimedia.org/r/391916
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2f4d0927731ee9e12c7b1d8e5f0136c921cfe0f6
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Mepps 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/391074 )

Change subject: Merge branch 'master' into deployment
..


Merge branch 'master' into deployment

6f3e30088 Fix activity_type_id
aa715dd72 Use standard 'from' in TY test form
28933a2bc Update CiviCRM submodule

Change-Id: If82490e5524f058154505328fc8e0a59ead2d163
---
0 files changed, 0 insertions(+), 0 deletions(-)

Approvals:
  jenkins-bot: Verified
  Ejegg: Looks good to me, approved




-- 
To view, visit https://gerrit.wikimedia.org/r/391074
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: If82490e5524f058154505328fc8e0a59ead2d163
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

[Ejegg (Code Review)]

Ejegg has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/391074 )

Change subject: Merge branch 'master' into deployment
..

Merge branch 'master' into deployment

6f3e30088 Fix activity_type_id
aa715dd72 Use standard 'from' in TY test form
28933a2bc Update CiviCRM submodule

Change-Id: If82490e5524f058154505328fc8e0a59ead2d163
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/74/391074/1


-- 
To view, visit https://gerrit.wikimedia.org/r/391074
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: If82490e5524f058154505328fc8e0a59ead2d163
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/390088 )

Change subject: Merge branch 'master' into deployment
..


Merge branch 'master' into deployment

299c03513 Fix TY mail test form

Change-Id: I450caff1f209e47d6955eb712e376bdcd507c990
---
0 files changed, 0 insertions(+), 0 deletions(-)

Approvals:
  jenkins-bot: Verified
  Ejegg: Looks good to me, approved




-- 
To view, visit https://gerrit.wikimedia.org/r/390088
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I450caff1f209e47d6955eb712e376bdcd507c990
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

[Ejegg (Code Review)]

Ejegg has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/390088 )

Change subject: Merge branch 'master' into deployment
..

Merge branch 'master' into deployment

299c03513 Fix TY mail test form

Change-Id: I450caff1f209e47d6955eb712e376bdcd507c990
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/88/390088/1


-- 
To view, visit https://gerrit.wikimedia.org/r/390088
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I450caff1f209e47d6955eb712e376bdcd507c990
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/390084 )

Change subject: Merge branch 'master' into deployment
..


Merge branch 'master' into deployment

And update vendor

a126d53f4 Update donation-interface for new ty message subject
79462ced1 Update English thank you letter for 2017
470ee09c7 English TY letter updates
7dcaa28f8 Use shell-safe verp when not making CiviMail records

Change-Id: Ieaec47d10fd9f1f7f8ddec57bf9277fab0dbfa6e
---
D sites/all/modules/thank_you/tests/phpunit/ThankYouTest.php
D 
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/OmnigroupmemberGetTest.php
D 
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/OmnigroupmemberLoadTest.php
D 
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/OmnimailBaseTestClass.php
D 
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/OmnimailingGetTest.php
D 
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/OmnimailingLoadTest.php
D 
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/OmnirecipientGetTest.php
D 
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/OmnirecipientLoadTest.php
D 
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/OmnirecipientProcessUnsubscribesTest.php
D 
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/Responses/20170509_noCID
 - All - Jul 5 2017 06-27-45 AM.csv
D 
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/Responses/AggregateGetResponse1.txt
D 
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/Responses/AuthenticateResponse.txt
D 
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/Responses/ExportListResponse.txt
D 
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/Responses/GetMailingTemplateResponse.txt
D 
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/Responses/GetMailingTemplateResponse2.txt
D 
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/Responses/JobStatusCompleteResponse.txt
D 
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/Responses/JobStatusWaitingResponse.txt
D 
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/Responses/MailingGetResponse1.txt
D 
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/Responses/Raw
 Recipient Data Export Jul 03 2017 00-47-42 AM 1295.csv
D 
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/Responses/RawRecipientDataExportResponse.txt
D 
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/bootstrap.php
D 
sites/default/civicrm/extensions/org.wikimedia.rip/tests/phpunit/CRM/RipTest.php
D sites/default/civicrm/extensions/org.wikimedia.rip/tests/phpunit/bootstrap.php
M vendor
24 files changed, 1 insertion(+), 1,695 deletions(-)

Approvals:
  jenkins-bot: Verified
  Ejegg: Looks good to me, approved



diff --git a/sites/all/modules/thank_you/tests/phpunit/ThankYouTest.php 
b/sites/all/modules/thank_you/tests/phpunit/ThankYouTest.php
deleted file mode 100644
index 587ced2..000
--- a/sites/all/modules/thank_you/tests/phpunit/ThankYouTest.php
+++ /dev/null
@@ -1,164 +0,0 @@
-<<< HEAD   (dc1b27 Revert "Update English thank you letter for 2017")
-===
-message = array(
-   'city' => 'Somerville',
-   'country' => 'US',
-   'currency' => 'USD',
-   'date' => time(),
-   'email' => 'generousdo...@example.org',
-   'first_name' => 'Test',
-   'last_name' => 'Es',
-   'language' => 'en',
-   'gateway' => 'test_gateway',
-   'gateway_txn_id' => mt_rand(),
-   'gross' => '1.23',
-   'payment_method' => 'cc',
-   'postal_code' => '02144',
-   'state_province' => 'MA',
-   'street_address' => '1 Davis Square',
-   );
-   $this->old_civimail = variable_get( 
'thank_you_add_civimail_records', 'false' );
-   $this->old_civimail_rate = variable_get( 
'thank_you_civimail_rate', 1.0 );
-
-   $contribution = wmf_civicrm_contribution_message_import( 
$this->message );
-
-   $this->contact_id = $contribution['contact_id'];
-   $this->contribution_id = $contribution['id'];
-   }
-
-   public function tearDown() {
-   parent::cleanUpContact( $this->contact_id );
-   variable_set( 'thank_you_add_civimail_records', 
$this->old_civimail );
-   variable_get( 'thank_you_civimail_rate', 
$this->old_civimail_rate );
-   parent::tearDown();
-   }
-
-   /**
-

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

[Ejegg (Code Review)]

Ejegg has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/390084 )

Change subject: Merge branch 'master' into deployment
..

Merge branch 'master' into deployment

And update vendor

a126d53f4 Update donation-interface for new ty message subject
79462ced1 Update English thank you letter for 2017
470ee09c7 English TY letter updates
7dcaa28f8 Use shell-safe verp when not making CiviMail records

Change-Id: Ieaec47d10fd9f1f7f8ddec57bf9277fab0dbfa6e
---
D sites/all/modules/thank_you/tests/phpunit/ThankYouTest.php
D 
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/OmnigroupmemberGetTest.php
D 
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/OmnigroupmemberLoadTest.php
D 
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/OmnimailBaseTestClass.php
D 
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/OmnimailingGetTest.php
D 
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/OmnimailingLoadTest.php
D 
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/OmnirecipientGetTest.php
D 
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/OmnirecipientLoadTest.php
D 
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/OmnirecipientProcessUnsubscribesTest.php
D 
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/Responses/20170509_noCID
 - All - Jul 5 2017 06-27-45 AM.csv
D 
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/Responses/AggregateGetResponse1.txt
D 
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/Responses/AuthenticateResponse.txt
D 
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/Responses/ExportListResponse.txt
D 
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/Responses/GetMailingTemplateResponse.txt
D 
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/Responses/GetMailingTemplateResponse2.txt
D 
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/Responses/JobStatusCompleteResponse.txt
D 
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/Responses/JobStatusWaitingResponse.txt
D 
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/Responses/MailingGetResponse1.txt
D 
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/Responses/Raw
 Recipient Data Export Jul 03 2017 00-47-42 AM 1295.csv
D 
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/Responses/RawRecipientDataExportResponse.txt
D 
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/bootstrap.php
D 
sites/default/civicrm/extensions/org.wikimedia.rip/tests/phpunit/CRM/RipTest.php
D sites/default/civicrm/extensions/org.wikimedia.rip/tests/phpunit/bootstrap.php
M vendor
24 files changed, 1 insertion(+), 1,695 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/84/390084/1

diff --git a/sites/all/modules/thank_you/tests/phpunit/ThankYouTest.php 
b/sites/all/modules/thank_you/tests/phpunit/ThankYouTest.php
deleted file mode 100644
index 587ced2..000
--- a/sites/all/modules/thank_you/tests/phpunit/ThankYouTest.php
+++ /dev/null
@@ -1,164 +0,0 @@
-<<< HEAD   (dc1b27 Revert "Update English thank you letter for 2017")
-===
-message = array(
-   'city' => 'Somerville',
-   'country' => 'US',
-   'currency' => 'USD',
-   'date' => time(),
-   'email' => 'generousdo...@example.org',
-   'first_name' => 'Test',
-   'last_name' => 'Es',
-   'language' => 'en',
-   'gateway' => 'test_gateway',
-   'gateway_txn_id' => mt_rand(),
-   'gross' => '1.23',
-   'payment_method' => 'cc',
-   'postal_code' => '02144',
-   'state_province' => 'MA',
-   'street_address' => '1 Davis Square',
-   );
-   $this->old_civimail = variable_get( 
'thank_you_add_civimail_records', 'false' );
-   $this->old_civimail_rate = variable_get( 
'thank_you_civimail_rate', 1.0 );
-
-   $contribution = wmf_civicrm_contribution_message_import( 
$this->message );
-
-   $this->contact_id = $contribution['contact_id'];
-   $this->contribution_id = $contribution['id'];
-   }
-
-   public function tearDown() {
-   parent::cleanUpContact( $this->contact_id );
-   variable_set( 'thank_you_add_civimail_records', 
$this->old_civimail );
-   variable_get( 'thank_you_civimail_rate', 
$this->old_civimail_rate );
-   parent::tearDown();
-   }
-
-   /**

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/389880 )

Change subject: Merge branch 'master' into deployment
..


Merge branch 'master' into deployment

b9dfee206 Revert "Update English thank you letter for 2017"
4d348c450 Revert "Update donation-interface for new ty message subject"

Change-Id: Ie55ee09ad2e9b53ae552a8a6281a9b8ab5da2611
---
0 files changed, 0 insertions(+), 0 deletions(-)

Approvals:
  jenkins-bot: Verified
  Ejegg: Looks good to me, approved




-- 
To view, visit https://gerrit.wikimedia.org/r/389880
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie55ee09ad2e9b53ae552a8a6281a9b8ab5da2611
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

[Ejegg (Code Review)]

Ejegg has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/389880 )

Change subject: Merge branch 'master' into deployment
..

Merge branch 'master' into deployment

b9dfee206 Revert "Update English thank you letter for 2017"
4d348c450 Revert "Update donation-interface for new ty message subject"

Change-Id: Ie55ee09ad2e9b53ae552a8a6281a9b8ab5da2611
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/80/389880/1


-- 
To view, visit https://gerrit.wikimedia.org/r/389880
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie55ee09ad2e9b53ae552a8a6281a9b8ab5da2611
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/389874 )

Change subject: Merge branch 'master' into deployment
..


Merge branch 'master' into deployment

a9088e89c Update English thank you letter for 2017

Change-Id: I6357140ad41a9eb6a19df7c9f5cf5c8d43984acd
---
0 files changed, 0 insertions(+), 0 deletions(-)

Approvals:
  jenkins-bot: Verified
  Ejegg: Looks good to me, approved




-- 
To view, visit https://gerrit.wikimedia.org/r/389874
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I6357140ad41a9eb6a19df7c9f5cf5c8d43984acd
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

[Ejegg (Code Review)]

Ejegg has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/389874 )

Change subject: Merge branch 'master' into deployment
..

Merge branch 'master' into deployment

a9088e89c Update English thank you letter for 2017

Change-Id: I6357140ad41a9eb6a19df7c9f5cf5c8d43984acd
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/74/389874/1


-- 
To view, visit https://gerrit.wikimedia.org/r/389874
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6357140ad41a9eb6a19df7c9f5cf5c8d43984acd
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/389825 )

Change subject: Merge branch 'master' into deployment
..


Merge branch 'master' into deployment

43924d836 Make tests more readable by using dates
50c62a962 Only update contact on email match too
2cde2fbc7 Update donation-interface for new ty message subject
9a7aad8ae Script to update old activities

Change-Id: I78d3c5287dc09bb1d2f41f230db4f0114c210764
---
D sites/all/modules/wmf_civicrm/tests/phpunit/ImportMessageTest.php
1 file changed, 0 insertions(+), 925 deletions(-)

Approvals:
  jenkins-bot: Verified
  Ejegg: Looks good to me, approved



diff --git a/sites/all/modules/wmf_civicrm/tests/phpunit/ImportMessageTest.php 
b/sites/all/modules/wmf_civicrm/tests/phpunit/ImportMessageTest.php
deleted file mode 100644
index 9f368ed..000
--- a/sites/all/modules/wmf_civicrm/tests/phpunit/ImportMessageTest.php
+++ /dev/null
@@ -1,925 +0,0 @@
-<<< HEAD   (dc9d05 Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wiki)
-===
- WMF_CAMPAIGNS_OPTION_GROUP_NAME,
-'label' => ImportMessageTest_campaign,
-'value' => ImportMessageTest_campaign,
-) );
-}
-
-public function tearDown() {
-if ( $this->contribution_id ) {
-  $this->callAPISuccess('Contribution', 'delete', array('id' => 
$this->contribution_id));
-}
-if ( $this->contact_id ) {
-$this->cleanUpContact( $this->contact_id );
-}
-parent::tearDown();
-}
-
-/**
- * @dataProvider messageProvider
- */
-public function testMessageInsert( $msg, $expected ) {
-$contribution = wmf_civicrm_contribution_message_import( $msg );
-$this->contribution_id = $contribution['id'];
-
-// Ignore contact_id if we have no expectation.
-if ( empty( $expected['contribution']['contact_id'] ) ) {
-$this->fieldsToIgnore[] = 'contact_id';
-}
-
-$this->assertComparable( $expected['contribution'], $contribution );
-
-if ( !empty( $expected['contribution_custom_values'] ) ) {
-$actual_contribution_custom_values = wmf_civicrm_get_custom_values(
-$contribution['id'],
-array_keys( $expected['contribution_custom_values'] )
-);
-$this->assertEquals( $expected['contribution_custom_values'], 
$actual_contribution_custom_values );
-}
-
-if ( !empty( $expected['contact'] ) ) {
-$contact = $this->callAPISuccessGetSingle('Contact', array('id' => 
$contribution['contact_id']));
-$renamedFields = array('prefix' => 1, 'suffix' => 1);
-$this->assertEquals( array_diff_key($expected['contact'], 
$renamedFields), array_intersect_key( $contact, $expected['contact'] ), 
print_r(array_intersect_key( $contact, $expected['contact'] ), TRUE) . " does 
not match " . print_r(array_diff_key($expected['contact'], $renamedFields), 
TRUE));
-foreach (array_keys($renamedFields) as $renamedField) {
-  if (isset($expected['contact'][$renamedField])) {
-$this->assertEquals(civicrm_api3('OptionValue', 'getvalue', 
array(
-  'value' => $contact[$renamedField . '_id'],
-  'option_group_id' => 'individual_' . $renamedField,
-  'return' => 'name',
-)), $expected['contact'][$renamedField]);
-  }
-}
-}
-
-   if ( !empty( $expected['address'] ) ) {
-   $addresses = civicrm_api3( 'Address', 'get', array(
-   'contact_id' => $contribution['contact_id'],
-   'return' => 
'country_id,state_province_id,city,postal_code,street_address,geo_code_1,geo_code_2,timezone',
-   ) );
-   $address = $addresses['values'][$addresses['id']];
-   $this->assertComparable( $expected['address'], $address 
);
-   }
-
-if ( !empty( $expected['contact_custom_values'] ) ) {
-$actual_contact_custom_values = wmf_civicrm_get_custom_values(
-$contribution['contact_id'],
-array_keys( $expected['contact_custom_values'] )
-);
-$this->assertEquals( $expected['contact_custom_values'], 
$actual_contact_custom_values );
-}
-}
-
-public function messageProvider() {
-   // Make static so it isn't destroyed until class cleanup.
-   self::$fixtures = CiviFixtures::create();
-
-   $contribution_type_cash = wmf_civicrm_get_civi_id( 
'contribution_type_id', 'Cash' );
-   $payment_instrument_cc = wmf_civicrm_get_civi_id( 
'payment_instrument_id', 'Credit Card' );
-   $payment_instrument_check = wmf_civicrm_get_civi_id( 
'payment_instrument_id', 'Check' );

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

[Ejegg (Code Review)]

Ejegg has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/389825 )

Change subject: Merge branch 'master' into deployment
..

Merge branch 'master' into deployment

43924d836 Make tests more readable by using dates
50c62a962 Only update contact on email match too
2cde2fbc7 Update donation-interface for new ty message subject
9a7aad8ae Script to update old activities

Change-Id: I78d3c5287dc09bb1d2f41f230db4f0114c210764
---
D sites/all/modules/wmf_civicrm/tests/phpunit/ImportMessageTest.php
1 file changed, 0 insertions(+), 925 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/25/389825/1

diff --git a/sites/all/modules/wmf_civicrm/tests/phpunit/ImportMessageTest.php 
b/sites/all/modules/wmf_civicrm/tests/phpunit/ImportMessageTest.php
deleted file mode 100644
index 9f368ed..000
--- a/sites/all/modules/wmf_civicrm/tests/phpunit/ImportMessageTest.php
+++ /dev/null
@@ -1,925 +0,0 @@
-<<< HEAD   (dc9d05 Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wiki)
-===
- WMF_CAMPAIGNS_OPTION_GROUP_NAME,
-'label' => ImportMessageTest_campaign,
-'value' => ImportMessageTest_campaign,
-) );
-}
-
-public function tearDown() {
-if ( $this->contribution_id ) {
-  $this->callAPISuccess('Contribution', 'delete', array('id' => 
$this->contribution_id));
-}
-if ( $this->contact_id ) {
-$this->cleanUpContact( $this->contact_id );
-}
-parent::tearDown();
-}
-
-/**
- * @dataProvider messageProvider
- */
-public function testMessageInsert( $msg, $expected ) {
-$contribution = wmf_civicrm_contribution_message_import( $msg );
-$this->contribution_id = $contribution['id'];
-
-// Ignore contact_id if we have no expectation.
-if ( empty( $expected['contribution']['contact_id'] ) ) {
-$this->fieldsToIgnore[] = 'contact_id';
-}
-
-$this->assertComparable( $expected['contribution'], $contribution );
-
-if ( !empty( $expected['contribution_custom_values'] ) ) {
-$actual_contribution_custom_values = wmf_civicrm_get_custom_values(
-$contribution['id'],
-array_keys( $expected['contribution_custom_values'] )
-);
-$this->assertEquals( $expected['contribution_custom_values'], 
$actual_contribution_custom_values );
-}
-
-if ( !empty( $expected['contact'] ) ) {
-$contact = $this->callAPISuccessGetSingle('Contact', array('id' => 
$contribution['contact_id']));
-$renamedFields = array('prefix' => 1, 'suffix' => 1);
-$this->assertEquals( array_diff_key($expected['contact'], 
$renamedFields), array_intersect_key( $contact, $expected['contact'] ), 
print_r(array_intersect_key( $contact, $expected['contact'] ), TRUE) . " does 
not match " . print_r(array_diff_key($expected['contact'], $renamedFields), 
TRUE));
-foreach (array_keys($renamedFields) as $renamedField) {
-  if (isset($expected['contact'][$renamedField])) {
-$this->assertEquals(civicrm_api3('OptionValue', 'getvalue', 
array(
-  'value' => $contact[$renamedField . '_id'],
-  'option_group_id' => 'individual_' . $renamedField,
-  'return' => 'name',
-)), $expected['contact'][$renamedField]);
-  }
-}
-}
-
-   if ( !empty( $expected['address'] ) ) {
-   $addresses = civicrm_api3( 'Address', 'get', array(
-   'contact_id' => $contribution['contact_id'],
-   'return' => 
'country_id,state_province_id,city,postal_code,street_address,geo_code_1,geo_code_2,timezone',
-   ) );
-   $address = $addresses['values'][$addresses['id']];
-   $this->assertComparable( $expected['address'], $address 
);
-   }
-
-if ( !empty( $expected['contact_custom_values'] ) ) {
-$actual_contact_custom_values = wmf_civicrm_get_custom_values(
-$contribution['contact_id'],
-array_keys( $expected['contact_custom_values'] )
-);
-$this->assertEquals( $expected['contact_custom_values'], 
$actual_contact_custom_values );
-}
-}
-
-public function messageProvider() {
-   // Make static so it isn't destroyed until class cleanup.
-   self::$fixtures = CiviFixtures::create();
-
-   $contribution_type_cash = wmf_civicrm_get_civi_id( 
'contribution_type_id', 'Cash' );
-   $payment_instrument_cc = wmf_civicrm_get_civi_id( 
'payment_instrument_id', 'Credit Card' );
-   $payment_instrument_check = wmf_civicrm_get_civi_id( 
'payment_instrument_id', 

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/387632 )

Change subject: Merge branch 'master' into deployment
..


Merge branch 'master' into deployment

727488d92 Use module_invoke for metrics
436aaffe7 Get rid of duplicate database connection

Change-Id: I973447305e8df84fa9b711c0e5b3a96853a98015
---
D sites/all/modules/recurring_globalcollect/tests/RecurringGlobalCollectTest.php
1 file changed, 0 insertions(+), 261 deletions(-)

Approvals:
  jenkins-bot: Verified
  Ejegg: Looks good to me, approved



diff --git 
a/sites/all/modules/recurring_globalcollect/tests/RecurringGlobalCollectTest.php
 
b/sites/all/modules/recurring_globalcollect/tests/RecurringGlobalCollectTest.php
deleted file mode 100644
index f9b5ed7..000
--- 
a/sites/all/modules/recurring_globalcollect/tests/RecurringGlobalCollectTest.php
+++ /dev/null
@@ -1,261 +0,0 @@
-<<< HEAD   (a34a9c Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wiki)
-===
-subscriptionId = 'SUB-FOO-' . mt_rand();
-   $this->amount = '1.12';
-
-   $this->contributions = array();
-
-   $result = civicrm_api3( 'Contact', 'create', array(
-   'first_name' => 'Testes',
-   'contact_type' => 'Individual',
-   ) );
-   $this->contactId = $result['id'];
-
-   $result = civicrm_api3( 'ContributionRecur', 'create', array(
-   'contact_id' => $this->contactId,
-   'amount' => $this->amount,
-   'frequency_interval' => 1,
-   'frequency_unit' => 'month',
-   'next_sched_contribution' => 
wmf_common_date_unix_to_civicrm(strtotime('+1 month')),
-   'installments' => 0,
-   'processor_id' => 1,
-   'currency' => 'USD',
-   'trxn_id' => "RECURRING GLOBALCOLLECT 
{$this->subscriptionId}",
-   ) );
-   $this->contributionRecurId = $result['id'];
-
-   $result = civicrm_api3( 'Contribution', 'create', array(
-   'contact_id' => $this->contactId,
-   'contribution_recur_id' => $this->contributionRecurId,
-   'currency' => 'USD',
-   'total_amount' => $this->amount,
-   'contribution_type' => 'Cash',
-   'payment_instrument' => 'Credit Card',
-   'trxn_id' => 'RECURRING GLOBALCOLLECT 
STUB_ORIG_CONTRIB-' . mt_rand(),
-   ) );
-   $this->contributions[] = $result['id'];
-   $tracking = array(
-   'utm_source' => '..rcc',
-   'utm_medium' => 'civicrm',
-   'ts' => wmf_common_date_unix_to_sql( strtotime( 'now' ) 
),
-   'contribution_id' => $result['id'],
-   );
-   TestingGlobalCollectAdapter::setDummyGatewayResponseCode( 
'recurring-OK' );
-   wmf_civicrm_insert_contribution_tracking( $tracking );
-   }
-
-   public function tearDown() {
-   parent::tearDown();
-   $this->cleanUpContact( $this->contactId );
-   TestingGlobalCollectAdapter::setDummyGatewayResponseCode( null 
);
-   }
-
-   function testChargeRecorded() {
-   recurring_globalcollect_charge( $this->contributionRecurId );
-
-   $result = civicrm_api3( 'Contribution', 'get', array(
-   'contact_id' => $this->contactId,
-   ) );
-   $this->assertEquals( 2, count( $result['values'] ) );
-   foreach ( $result['values'] as $contribution ) {
-   if ( $contribution['id'] == $this->contributions[0] ) {
-   // Skip assertions on the synthetic original 
contribution
-   continue;
-   }
-
-   $this->assertEquals( 1,
-   preg_match( "/^RECURRING GLOBALCOLLECT 
{$this->subscriptionId}-2\$/", $contribution['trxn_id'] ) );
-   }
-   }
-
-   public function testRecurringCharge() {
-   $init = array(
-   'contribution_tracking_id' => mt_rand(),
-   'amount' => '2345',
-   'effort_id' => 2,
-   'order_id' => '9998890004',
-   'currency' => 'EUR',
-   'payment_method' => 'cc',
-   );
-   $gateway = DonationInterfaceFactory::createAdapter( 
'globalcollect', $init );
-
-   $result = $gateway->do_transaction( 'Recurring_Charge' );
-
-   $this->assertTrue( $result->getCommunicationStatus() );
-   $this->assertRegExp( 

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

[Ejegg (Code Review)]

Ejegg has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/387632 )

Change subject: Merge branch 'master' into deployment
..

Merge branch 'master' into deployment

727488d92 Use module_invoke for metrics
436aaffe7 Get rid of duplicate database connection

Change-Id: I973447305e8df84fa9b711c0e5b3a96853a98015
---
D sites/all/modules/recurring_globalcollect/tests/RecurringGlobalCollectTest.php
1 file changed, 0 insertions(+), 261 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/32/387632/1

diff --git 
a/sites/all/modules/recurring_globalcollect/tests/RecurringGlobalCollectTest.php
 
b/sites/all/modules/recurring_globalcollect/tests/RecurringGlobalCollectTest.php
deleted file mode 100644
index f9b5ed7..000
--- 
a/sites/all/modules/recurring_globalcollect/tests/RecurringGlobalCollectTest.php
+++ /dev/null
@@ -1,261 +0,0 @@
-<<< HEAD   (a34a9c Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wiki)
-===
-subscriptionId = 'SUB-FOO-' . mt_rand();
-   $this->amount = '1.12';
-
-   $this->contributions = array();
-
-   $result = civicrm_api3( 'Contact', 'create', array(
-   'first_name' => 'Testes',
-   'contact_type' => 'Individual',
-   ) );
-   $this->contactId = $result['id'];
-
-   $result = civicrm_api3( 'ContributionRecur', 'create', array(
-   'contact_id' => $this->contactId,
-   'amount' => $this->amount,
-   'frequency_interval' => 1,
-   'frequency_unit' => 'month',
-   'next_sched_contribution' => 
wmf_common_date_unix_to_civicrm(strtotime('+1 month')),
-   'installments' => 0,
-   'processor_id' => 1,
-   'currency' => 'USD',
-   'trxn_id' => "RECURRING GLOBALCOLLECT 
{$this->subscriptionId}",
-   ) );
-   $this->contributionRecurId = $result['id'];
-
-   $result = civicrm_api3( 'Contribution', 'create', array(
-   'contact_id' => $this->contactId,
-   'contribution_recur_id' => $this->contributionRecurId,
-   'currency' => 'USD',
-   'total_amount' => $this->amount,
-   'contribution_type' => 'Cash',
-   'payment_instrument' => 'Credit Card',
-   'trxn_id' => 'RECURRING GLOBALCOLLECT 
STUB_ORIG_CONTRIB-' . mt_rand(),
-   ) );
-   $this->contributions[] = $result['id'];
-   $tracking = array(
-   'utm_source' => '..rcc',
-   'utm_medium' => 'civicrm',
-   'ts' => wmf_common_date_unix_to_sql( strtotime( 'now' ) 
),
-   'contribution_id' => $result['id'],
-   );
-   TestingGlobalCollectAdapter::setDummyGatewayResponseCode( 
'recurring-OK' );
-   wmf_civicrm_insert_contribution_tracking( $tracking );
-   }
-
-   public function tearDown() {
-   parent::tearDown();
-   $this->cleanUpContact( $this->contactId );
-   TestingGlobalCollectAdapter::setDummyGatewayResponseCode( null 
);
-   }
-
-   function testChargeRecorded() {
-   recurring_globalcollect_charge( $this->contributionRecurId );
-
-   $result = civicrm_api3( 'Contribution', 'get', array(
-   'contact_id' => $this->contactId,
-   ) );
-   $this->assertEquals( 2, count( $result['values'] ) );
-   foreach ( $result['values'] as $contribution ) {
-   if ( $contribution['id'] == $this->contributions[0] ) {
-   // Skip assertions on the synthetic original 
contribution
-   continue;
-   }
-
-   $this->assertEquals( 1,
-   preg_match( "/^RECURRING GLOBALCOLLECT 
{$this->subscriptionId}-2\$/", $contribution['trxn_id'] ) );
-   }
-   }
-
-   public function testRecurringCharge() {
-   $init = array(
-   'contribution_tracking_id' => mt_rand(),
-   'amount' => '2345',
-   'effort_id' => 2,
-   'order_id' => '9998890004',
-   'currency' => 'EUR',
-   'payment_method' => 'cc',
-   );
-   $gateway = DonationInterfaceFactory::createAdapter( 
'globalcollect', $init );
-
-   $result = $gateway->do_transaction( 'Recurring_Charge' );
-
-   $this->assertTrue( $result->getCommunicationStatus() );
-   $this->assertRegExp( 

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/385028 )

Change subject: Merge branch 'master' into deployment
..


Merge branch 'master' into deployment

d351418c4 Check contact_hash if contact_id exists

Change-Id: I7c9a7fa63422edf9017557f33683ce25a534199c
---
D sites/all/modules/wmf_civicrm/tests/phpunit/ImportMessageTest.php
1 file changed, 0 insertions(+), 862 deletions(-)

Approvals:
  jenkins-bot: Verified
  Ejegg: Looks good to me, approved



diff --git a/sites/all/modules/wmf_civicrm/tests/phpunit/ImportMessageTest.php 
b/sites/all/modules/wmf_civicrm/tests/phpunit/ImportMessageTest.php
deleted file mode 100644
index af54321..000
--- a/sites/all/modules/wmf_civicrm/tests/phpunit/ImportMessageTest.php
+++ /dev/null
@@ -1,862 +0,0 @@
-<<< HEAD   (7c2679 Merge branch 'master' into deployment)
-===
- WMF_CAMPAIGNS_OPTION_GROUP_NAME,
-'label' => ImportMessageTest_campaign,
-'value' => ImportMessageTest_campaign,
-) );
-}
-
-public function tearDown() {
-if ( $this->contribution_id ) {
-  $this->callAPISuccess('Contribution', 'delete', array('id' => 
$this->contribution_id));
-}
-if ( $this->contact_id ) {
-$this->cleanUpContact( $this->contact_id );
-}
-parent::tearDown();
-}
-
-/**
- * @dataProvider messageProvider
- */
-public function testMessageInsert( $msg, $expected ) {
-$contribution = wmf_civicrm_contribution_message_import( $msg );
-$this->contribution_id = $contribution['id'];
-
-// Ignore contact_id if we have no expectation.
-if ( empty( $expected['contribution']['contact_id'] ) ) {
-$this->fieldsToIgnore[] = 'contact_id';
-}
-
-$this->assertComparable( $expected['contribution'], $contribution );
-
-if ( !empty( $expected['contribution_custom_values'] ) ) {
-$actual_contribution_custom_values = wmf_civicrm_get_custom_values(
-$contribution['id'],
-array_keys( $expected['contribution_custom_values'] )
-);
-$this->assertEquals( $expected['contribution_custom_values'], 
$actual_contribution_custom_values );
-}
-
-if ( !empty( $expected['contact'] ) ) {
-$contact = $this->callAPISuccessGetSingle('Contact', array('id' => 
$contribution['contact_id']));
-$renamedFields = array('prefix' => 1, 'suffix' => 1);
-$this->assertEquals( array_diff_key($expected['contact'], 
$renamedFields), array_intersect_key( $contact, $expected['contact'] ), 
print_r(array_intersect_key( $contact, $expected['contact'] ), TRUE) . " does 
not match " . print_r(array_diff_key($expected['contact'], $renamedFields), 
TRUE));
-foreach (array_keys($renamedFields) as $renamedField) {
-  if (isset($expected['contact'][$renamedField])) {
-$this->assertEquals(civicrm_api3('OptionValue', 'getvalue', 
array(
-  'value' => $contact[$renamedField . '_id'],
-  'option_group_id' => 'individual_' . $renamedField,
-  'return' => 'name',
-)), $expected['contact'][$renamedField]);
-  }
-}
-}
-
-   if ( !empty( $expected['address'] ) ) {
-   $addresses = civicrm_api3( 'Address', 'get', array(
-   'contact_id' => $contribution['contact_id'],
-   'return' => 
'country_id,state_province_id,city,postal_code,street_address,geo_code_1,geo_code_2,timezone',
-   ) );
-   $address = $addresses['values'][$addresses['id']];
-   $this->assertComparable( $expected['address'], $address 
);
-   }
-
-if ( !empty( $expected['contact_custom_values'] ) ) {
-$actual_contact_custom_values = wmf_civicrm_get_custom_values(
-$contribution['contact_id'],
-array_keys( $expected['contact_custom_values'] )
-);
-$this->assertEquals( $expected['contact_custom_values'], 
$actual_contact_custom_values );
-}
-}
-
-public function messageProvider() {
-   // Make static so it isn't destroyed until class cleanup.
-   self::$fixtures = CiviFixtures::create();
-
-   $contribution_type_cash = wmf_civicrm_get_civi_id( 
'contribution_type_id', 'Cash' );
-   $payment_instrument_cc = wmf_civicrm_get_civi_id( 
'payment_instrument_id', 'Credit Card' );
-   $payment_instrument_check = wmf_civicrm_get_civi_id( 
'payment_instrument_id', 'Check' );
-
-   $gateway_txn_id = mt_rand();
-   $check_number = (string) mt_rand();
-
-   $new_prefix = 'M' . mt_rand();
-
-   $cases = 

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

[Ejegg (Code Review)]

Ejegg has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/385028 )

Change subject: Merge branch 'master' into deployment
..

Merge branch 'master' into deployment

d351418c4 Check contact_hash if contact_id exists

Change-Id: I7c9a7fa63422edf9017557f33683ce25a534199c
---
D sites/all/modules/wmf_civicrm/tests/phpunit/ImportMessageTest.php
1 file changed, 0 insertions(+), 862 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/28/385028/1

diff --git a/sites/all/modules/wmf_civicrm/tests/phpunit/ImportMessageTest.php 
b/sites/all/modules/wmf_civicrm/tests/phpunit/ImportMessageTest.php
deleted file mode 100644
index af54321..000
--- a/sites/all/modules/wmf_civicrm/tests/phpunit/ImportMessageTest.php
+++ /dev/null
@@ -1,862 +0,0 @@
-<<< HEAD   (7c2679 Merge branch 'master' into deployment)
-===
- WMF_CAMPAIGNS_OPTION_GROUP_NAME,
-'label' => ImportMessageTest_campaign,
-'value' => ImportMessageTest_campaign,
-) );
-}
-
-public function tearDown() {
-if ( $this->contribution_id ) {
-  $this->callAPISuccess('Contribution', 'delete', array('id' => 
$this->contribution_id));
-}
-if ( $this->contact_id ) {
-$this->cleanUpContact( $this->contact_id );
-}
-parent::tearDown();
-}
-
-/**
- * @dataProvider messageProvider
- */
-public function testMessageInsert( $msg, $expected ) {
-$contribution = wmf_civicrm_contribution_message_import( $msg );
-$this->contribution_id = $contribution['id'];
-
-// Ignore contact_id if we have no expectation.
-if ( empty( $expected['contribution']['contact_id'] ) ) {
-$this->fieldsToIgnore[] = 'contact_id';
-}
-
-$this->assertComparable( $expected['contribution'], $contribution );
-
-if ( !empty( $expected['contribution_custom_values'] ) ) {
-$actual_contribution_custom_values = wmf_civicrm_get_custom_values(
-$contribution['id'],
-array_keys( $expected['contribution_custom_values'] )
-);
-$this->assertEquals( $expected['contribution_custom_values'], 
$actual_contribution_custom_values );
-}
-
-if ( !empty( $expected['contact'] ) ) {
-$contact = $this->callAPISuccessGetSingle('Contact', array('id' => 
$contribution['contact_id']));
-$renamedFields = array('prefix' => 1, 'suffix' => 1);
-$this->assertEquals( array_diff_key($expected['contact'], 
$renamedFields), array_intersect_key( $contact, $expected['contact'] ), 
print_r(array_intersect_key( $contact, $expected['contact'] ), TRUE) . " does 
not match " . print_r(array_diff_key($expected['contact'], $renamedFields), 
TRUE));
-foreach (array_keys($renamedFields) as $renamedField) {
-  if (isset($expected['contact'][$renamedField])) {
-$this->assertEquals(civicrm_api3('OptionValue', 'getvalue', 
array(
-  'value' => $contact[$renamedField . '_id'],
-  'option_group_id' => 'individual_' . $renamedField,
-  'return' => 'name',
-)), $expected['contact'][$renamedField]);
-  }
-}
-}
-
-   if ( !empty( $expected['address'] ) ) {
-   $addresses = civicrm_api3( 'Address', 'get', array(
-   'contact_id' => $contribution['contact_id'],
-   'return' => 
'country_id,state_province_id,city,postal_code,street_address,geo_code_1,geo_code_2,timezone',
-   ) );
-   $address = $addresses['values'][$addresses['id']];
-   $this->assertComparable( $expected['address'], $address 
);
-   }
-
-if ( !empty( $expected['contact_custom_values'] ) ) {
-$actual_contact_custom_values = wmf_civicrm_get_custom_values(
-$contribution['contact_id'],
-array_keys( $expected['contact_custom_values'] )
-);
-$this->assertEquals( $expected['contact_custom_values'], 
$actual_contact_custom_values );
-}
-}
-
-public function messageProvider() {
-   // Make static so it isn't destroyed until class cleanup.
-   self::$fixtures = CiviFixtures::create();
-
-   $contribution_type_cash = wmf_civicrm_get_civi_id( 
'contribution_type_id', 'Cash' );
-   $payment_instrument_cc = wmf_civicrm_get_civi_id( 
'payment_instrument_id', 'Credit Card' );
-   $payment_instrument_check = wmf_civicrm_get_civi_id( 
'payment_instrument_id', 'Check' );
-
-   $gateway_txn_id = mt_rand();
-   $check_number = (string) mt_rand();
-
-   $new_prefix = 'M' . mt_rand();
-
-   

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/384897 )

Change subject: Merge branch 'master' into deployment
..


Merge branch 'master' into deployment

5829892bf Backfill country-only addresses

Change-Id: Icfa02abb06286204b8892d0b6dc700a022006775
---
0 files changed, 0 insertions(+), 0 deletions(-)

Approvals:
  jenkins-bot: Verified
  Ejegg: Looks good to me, approved




-- 
To view, visit https://gerrit.wikimedia.org/r/384897
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Icfa02abb06286204b8892d0b6dc700a022006775
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

[Ejegg (Code Review)]

Ejegg has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/384897 )

Change subject: Merge branch 'master' into deployment
..

Merge branch 'master' into deployment

5829892bf Backfill country-only addresses

Change-Id: Icfa02abb06286204b8892d0b6dc700a022006775
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/97/384897/1


-- 
To view, visit https://gerrit.wikimedia.org/r/384897
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Icfa02abb06286204b8892d0b6dc700a022006775
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/384627 )

Change subject: Merge branch 'master' into deployment
..


Merge branch 'master' into deployment

988031680 Fix a couple base test case things
1c8b26ce8 Updated donation interface for orphan_slayer and module update Bug: 
T172202
b77f36637 Fix country-only address imports
795090e11 Update CiviCRM submodule

Change-Id: I3678a781e975ab3e07c650a6b3f1bd694c1c10dc
---
D sites/all/modules/wmf_civicrm/tests/phpunit/ImportMessageTest.php
D sites/all/modules/wmf_common/tests/includes/BaseWmfDrupalPhpUnitTestCase.php
2 files changed, 0 insertions(+), 1,024 deletions(-)

Approvals:
  jenkins-bot: Verified
  Ejegg: Looks good to me, approved



diff --git a/sites/all/modules/wmf_civicrm/tests/phpunit/ImportMessageTest.php 
b/sites/all/modules/wmf_civicrm/tests/phpunit/ImportMessageTest.php
deleted file mode 100644
index a5a7f7c..000
--- a/sites/all/modules/wmf_civicrm/tests/phpunit/ImportMessageTest.php
+++ /dev/null
@@ -1,783 +0,0 @@
-<<< HEAD   (b95306 Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wiki)
-===
- WMF_CAMPAIGNS_OPTION_GROUP_NAME,
-'label' => ImportMessageTest_campaign,
-'value' => ImportMessageTest_campaign,
-) );
-}
-
-public function tearDown() {
-if ( $this->contribution_id ) {
-  $this->callAPISuccess('Contribution', 'delete', array('id' => 
$this->contribution_id));
-}
-parent::tearDown();
-}
-
-/**
- * @dataProvider messageProvider
- */
-public function testMessageInsert( $msg, $expected ) {
-$contribution = wmf_civicrm_contribution_message_import( $msg );
-$this->contribution_id = $contribution['id'];
-
-// Ignore contact_id if we have no expectation.
-if ( empty( $expected['contribution']['contact_id'] ) ) {
-$this->fieldsToIgnore[] = 'contact_id';
-}
-
-$this->assertComparable( $expected['contribution'], $contribution );
-
-if ( !empty( $expected['contribution_custom_values'] ) ) {
-$actual_contribution_custom_values = wmf_civicrm_get_custom_values(
-$contribution['id'],
-array_keys( $expected['contribution_custom_values'] )
-);
-$this->assertEquals( $expected['contribution_custom_values'], 
$actual_contribution_custom_values );
-}
-
-if ( !empty( $expected['contact'] ) ) {
-$contact = $this->callAPISuccessGetSingle('Contact', array('id' => 
$contribution['contact_id']));
-$renamedFields = array('prefix' => 1, 'suffix' => 1);
-$this->assertEquals( array_diff_key($expected['contact'], 
$renamedFields), array_intersect_key( $contact, $expected['contact'] ), 
print_r(array_intersect_key( $contact, $expected['contact'] ), TRUE) . " does 
not match " . print_r(array_diff_key($expected['contact'], $renamedFields), 
TRUE));
-foreach (array_keys($renamedFields) as $renamedField) {
-  if (isset($expected['contact'][$renamedField])) {
-$this->assertEquals(civicrm_api3('OptionValue', 'getvalue', 
array(
-  'value' => $contact[$renamedField . '_id'],
-  'option_group_id' => 'individual_' . $renamedField,
-  'return' => 'name',
-)), $expected['contact'][$renamedField]);
-  }
-}
-}
-
-   if ( !empty( $expected['address'] ) ) {
-   $addresses = civicrm_api3( 'Address', 'get', array(
-   'contact_id' => $contribution['contact_id'],
-   'return' => 
'country_id,state_province_id,city,postal_code,street_address,geo_code_1,geo_code_2,timezone',
-   ) );
-   $address = $addresses['values'][$addresses['id']];
-   $this->assertComparable( $expected['address'], $address 
);
-   }
-
-if ( !empty( $expected['contact_custom_values'] ) ) {
-$actual_contact_custom_values = wmf_civicrm_get_custom_values(
-$contribution['contact_id'],
-array_keys( $expected['contact_custom_values'] )
-);
-$this->assertEquals( $expected['contact_custom_values'], 
$actual_contact_custom_values );
-}
-}
-
-public function messageProvider() {
-   // Make static so it isn't destroyed until class cleanup.
-   self::$fixtures = CiviFixtures::create();
-
-   $contribution_type_cash = wmf_civicrm_get_civi_id( 
'contribution_type_id', 'Cash' );
-   $payment_instrument_cc = wmf_civicrm_get_civi_id( 
'payment_instrument_id', 'Credit Card' );
-   $payment_instrument_check = wmf_civicrm_get_civi_id( 
'payment_instrument_id', 'Check' );
-
- 

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

[Ejegg (Code Review)]

Ejegg has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/384627 )

Change subject: Merge branch 'master' into deployment
..

Merge branch 'master' into deployment

988031680 Fix a couple base test case things
1c8b26ce8 Updated donation interface for orphan_slayer and module update Bug: 
T172202
b77f36637 Fix country-only address imports
795090e11 Update CiviCRM submodule

Change-Id: I3678a781e975ab3e07c650a6b3f1bd694c1c10dc
---
D sites/all/modules/wmf_civicrm/tests/phpunit/ImportMessageTest.php
D sites/all/modules/wmf_common/tests/includes/BaseWmfDrupalPhpUnitTestCase.php
2 files changed, 0 insertions(+), 1,024 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/27/384627/1

diff --git a/sites/all/modules/wmf_civicrm/tests/phpunit/ImportMessageTest.php 
b/sites/all/modules/wmf_civicrm/tests/phpunit/ImportMessageTest.php
deleted file mode 100644
index a5a7f7c..000
--- a/sites/all/modules/wmf_civicrm/tests/phpunit/ImportMessageTest.php
+++ /dev/null
@@ -1,783 +0,0 @@
-<<< HEAD   (b95306 Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wiki)
-===
- WMF_CAMPAIGNS_OPTION_GROUP_NAME,
-'label' => ImportMessageTest_campaign,
-'value' => ImportMessageTest_campaign,
-) );
-}
-
-public function tearDown() {
-if ( $this->contribution_id ) {
-  $this->callAPISuccess('Contribution', 'delete', array('id' => 
$this->contribution_id));
-}
-parent::tearDown();
-}
-
-/**
- * @dataProvider messageProvider
- */
-public function testMessageInsert( $msg, $expected ) {
-$contribution = wmf_civicrm_contribution_message_import( $msg );
-$this->contribution_id = $contribution['id'];
-
-// Ignore contact_id if we have no expectation.
-if ( empty( $expected['contribution']['contact_id'] ) ) {
-$this->fieldsToIgnore[] = 'contact_id';
-}
-
-$this->assertComparable( $expected['contribution'], $contribution );
-
-if ( !empty( $expected['contribution_custom_values'] ) ) {
-$actual_contribution_custom_values = wmf_civicrm_get_custom_values(
-$contribution['id'],
-array_keys( $expected['contribution_custom_values'] )
-);
-$this->assertEquals( $expected['contribution_custom_values'], 
$actual_contribution_custom_values );
-}
-
-if ( !empty( $expected['contact'] ) ) {
-$contact = $this->callAPISuccessGetSingle('Contact', array('id' => 
$contribution['contact_id']));
-$renamedFields = array('prefix' => 1, 'suffix' => 1);
-$this->assertEquals( array_diff_key($expected['contact'], 
$renamedFields), array_intersect_key( $contact, $expected['contact'] ), 
print_r(array_intersect_key( $contact, $expected['contact'] ), TRUE) . " does 
not match " . print_r(array_diff_key($expected['contact'], $renamedFields), 
TRUE));
-foreach (array_keys($renamedFields) as $renamedField) {
-  if (isset($expected['contact'][$renamedField])) {
-$this->assertEquals(civicrm_api3('OptionValue', 'getvalue', 
array(
-  'value' => $contact[$renamedField . '_id'],
-  'option_group_id' => 'individual_' . $renamedField,
-  'return' => 'name',
-)), $expected['contact'][$renamedField]);
-  }
-}
-}
-
-   if ( !empty( $expected['address'] ) ) {
-   $addresses = civicrm_api3( 'Address', 'get', array(
-   'contact_id' => $contribution['contact_id'],
-   'return' => 
'country_id,state_province_id,city,postal_code,street_address,geo_code_1,geo_code_2,timezone',
-   ) );
-   $address = $addresses['values'][$addresses['id']];
-   $this->assertComparable( $expected['address'], $address 
);
-   }
-
-if ( !empty( $expected['contact_custom_values'] ) ) {
-$actual_contact_custom_values = wmf_civicrm_get_custom_values(
-$contribution['contact_id'],
-array_keys( $expected['contact_custom_values'] )
-);
-$this->assertEquals( $expected['contact_custom_values'], 
$actual_contact_custom_values );
-}
-}
-
-public function messageProvider() {
-   // Make static so it isn't destroyed until class cleanup.
-   self::$fixtures = CiviFixtures::create();
-
-   $contribution_type_cash = wmf_civicrm_get_civi_id( 
'contribution_type_id', 'Cash' );
-   $payment_instrument_cc = wmf_civicrm_get_civi_id( 
'payment_instrument_id', 'Credit Card' );
-   $payment_instrument_check = wmf_civicrm_get_civi_id( 
'payment_instrument_id', 'Check' );
-
-   

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

[Ejegg (Code Review)]

Ejegg has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/383957 )

Change subject: Merge branch 'master' into deployment
..

Merge branch 'master' into deployment

9fa46538d Fix Omnimailing.load job to bypass creating recipients & to use 
internal replace, add test.

Change-Id: I924a1d028ebaaa33879bdb74b8e817b8247481d6
---
D 
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/OmnigroupmemberGetTest.php
D 
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/OmnigroupmemberLoadTest.php
D 
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/OmnimailBaseTestClass.php
D 
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/OmnimailingGetTest.php
D 
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/OmnimailingLoadTest.php
D 
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/OmnirecipientGetTest.php
D 
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/OmnirecipientLoadTest.php
D 
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/OmnirecipientProcessUnsubscribesTest.php
D 
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/Responses/20170509_noCID
 - All - Jul 5 2017 06-27-45 AM.csv
D 
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/Responses/AggregateGetResponse1.txt
D 
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/Responses/AuthenticateResponse.txt
D 
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/Responses/ExportListResponse.txt
D 
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/Responses/GetMailingTemplateResponse.txt
D 
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/Responses/GetMailingTemplateResponse2.txt
D 
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/Responses/JobStatusCompleteResponse.txt
D 
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/Responses/JobStatusWaitingResponse.txt
D 
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/Responses/MailingGetResponse1.txt
D 
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/Responses/Raw
 Recipient Data Export Jul 03 2017 00-47-42 AM 1295.csv
D 
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/Responses/RawRecipientDataExportResponse.txt
D 
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/bootstrap.php
20 files changed, 0 insertions(+), 1,404 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/57/383957/1

diff --git 
a/sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/OmnigroupmemberGetTest.php
 
b/sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/OmnigroupmemberGetTest.php
deleted file mode 100644
index 0509181..000
--- 
a/sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/OmnigroupmemberGetTest.php
+++ /dev/null
@@ -1,77 +0,0 @@
-https://github.com/civicrm/org.civicrm.testapalooza/blob/master/civi-test.md
-return \Civi\Test::e2e()
-  ->installMe(__DIR__)
-  ->apply();
-  }
-
-  public function tearDown() {
-parent::tearDown();
-  }
-
-  /**
-   * Example: Test that a version is returned.
-   */
-  public function testOmnigroupmemberGet() {
-$client = $this->setupSuccessfulDownloadClient();
-
-$result = civicrm_api3('Omnigroupmember', 'get', array('mail_provider' => 
'Silverpop', 'username' => 'Shrek', 'password' => 'Fiona', 'options' => 
array('limit' => 3), 'client' => $client, 'group_identifier' => 123));
-$this->assertEquals(3, $result['count']);
-$this->assertEquals('e...@example.com', $result['values'][0]['email']);
-$this->assertEquals('', $result['values'][0]['contact_id']);
-$this->assertEquals(TRUE, $result['values'][0]['is_opt_out']);
-$this->assertEquals('2016-10-18 20:01:00', 
$result['values'][0]['opt_in_date']);
-$this->assertEquals('2017-07-04 11:11:00', 
$result['values'][0]['opt_out_date']);
-$this->assertEquals('Added by WebForms', 
$result['values'][0]['opt_in_source']);
-$this->assertEquals('Opt out via email opt out.', 
$result['values'][0]['opt_out_source']);
-$this->assertEquals('clever place', $result['values'][2]['source']);
-$this->assertEquals('US', $result['values'][2]['country']);
-$this->assertEquals('en', $result['values'][2]['language']);
-$this->assertEquals('07/04/17', $result['values'][2]['created_date']);
-  }
-
-
-  /**
-   * @return \GuzzleHttp\Client
-   */
-  protected function setupSuccessfulDownloadClient() {
-$responses = array(
-  file_get_contents(__DIR__ . '/Responses/ExportListResponse.txt'),
-  file_get_contents(__DIR__ . '/Responses/JobStatusCompleteResponse.txt'),
-);
-copy(__DIR__ . '/Responses/20170509_noCID - All - 

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/383905 )

Change subject: Merge branch 'master' into deployment
..


Merge branch 'master' into deployment

24d996100 Manage merge on has-postal-suffix vs no-has-postal-suffix.
0312ac0c1 Allow importing gateway and Contribution Tracking ID
c03944475 Add editorconfig to various drupal dirs with drupal whitespace 
standard
a8e86ee45 Drop addresses without country

Change-Id: Ia56ce1a613a129c9f4551924d344352b8961ab5f
---
D sites/all/modules/metrics_reporting/tests/phpunit/PrometheusReporterTest.php
D sites/all/modules/offline2civicrm/tests/WmfImportTest.php
D sites/all/modules/orphan_slayer/tests/phpunit/OrphanSlayerTest.php
D sites/all/modules/wmf_civicrm/tests/phpunit/MergeTest.php
4 files changed, 0 insertions(+), 2,037 deletions(-)

Approvals:
  jenkins-bot: Verified
  Ejegg: Looks good to me, approved



diff --git 
a/sites/all/modules/metrics_reporting/tests/phpunit/PrometheusReporterTest.php 
b/sites/all/modules/metrics_reporting/tests/phpunit/PrometheusReporterTest.php
deleted file mode 100644
index 7df123f..000
--- 
a/sites/all/modules/metrics_reporting/tests/phpunit/PrometheusReporterTest.php
+++ /dev/null
@@ -1,31 +0,0 @@
- 157,
-   'orcs_befriended' => 3,
-   'prisoners_freed' => 5,
-   );
-   $reporter->reportMetrics( 'foo', $metrics );
-   $filename = $dir . DIRECTORY_SEPARATOR . 'foo' .
-   PrometheusReporter::$extension;
-   $this->assertFileExists( $filename );
-   // don't want the trailing newline
-   $written = rtrim( file_get_contents( $filename ) );
-   $split = explode( "\n", $written );
-   foreach ( $split as $metric ) {
-   list( $name, $value ) = explode( ' ', $metric );
-   $this->assertEquals( $metrics[$name], $value );
-   unset( $metrics[$name] );
-   }
-   $this->assertEmpty( $metrics, 'A metric was left unwritten' );
-   unlink( $filename );
-   rmdir( $dir );
-   }
-}
diff --git a/sites/all/modules/offline2civicrm/tests/WmfImportTest.php 
b/sites/all/modules/offline2civicrm/tests/WmfImportTest.php
deleted file mode 100644
index b1f480c..000
--- a/sites/all/modules/offline2civicrm/tests/WmfImportTest.php
+++ /dev/null
@@ -1,63 +0,0 @@
- 'Blah_source',
-   'utm_medium' => 'civicrm',
-   'utm_campaign' => 'test_campaign',
-   'ts' => wmf_common_date_unix_to_sql( time() )
-   ) );
-
-   $this->trxn_id = mt_rand();
-   $this->gateway = 'globalcollect';
-   $data = array(
-   'City' => 'blah city',
-   'Contribution Tracking ID' => $contribution_tracking_id,
-   'Country' => 'AR',
-   'Email' => 'em...@phony.com',
-   'External Batch Number' => mt_rand(),
-   'First Name' => 'Test_first_name',
-   'Gift Source' => 'Community GIft',
-   'Last Name' => 'Test_last_name',
-   'Original Amount' => '123',
-   'Original Currency' => 'USD',
-   'Payment Gateway' => $this->gateway,
-   'Payment Instrument' => 'Cash',
-   'Postal Code' => '90210',
-   'Postmark Date' => '2012-02-02',
-   'Received Date' => '2017-07-07',
-   'State' => 'CA',
-   'Street Address' => '123 Sunset Boulevard',
-   'Transaction ID' => $this->trxn_id,
-   );
-   $importer = new WmfImportFile( "no URI" );
-   $exposed = TestingAccessWrapper::newFromObject( $importer );
-   $message = $exposed->parseRow( $data );
-   $exposed->doImport( $message );
-   $contributions = wmf_civicrm_get_contributions_from_gateway_id(
-   $this->gateway, $this->trxn_id
-   );
-   $this->assertEquals( 1, count( $contributions ) );
-   $contribution = $contributions[0];
-   $this->assertEquals( $this->gateway, $contribution['gateway'] );
-   $ct = db_select( 'contribution_tracking', 
'contribution_tracking' )
-   ->fields( 'contribution_tracking' )
-   ->condition( 'id', $contribution_tracking_id )
-   ->execute()
-   ->fetchAssoc();
-   $this->assertEquals( $contribution['id'], 
$ct['contribution_id'] );
-   // TODO: should update existing c_t row with country!
-   // $this->assertEquals( 

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

[Ejegg (Code Review)]

Ejegg has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/383905 )

Change subject: Merge branch 'master' into deployment
..

Merge branch 'master' into deployment

24d996100 Manage merge on has-postal-suffix vs no-has-postal-suffix.
0312ac0c1 Allow importing gateway and Contribution Tracking ID
c03944475 Add editorconfig to various drupal dirs with drupal whitespace 
standard
a8e86ee45 Drop addresses without country

Change-Id: Ia56ce1a613a129c9f4551924d344352b8961ab5f
---
D sites/all/modules/metrics_reporting/tests/phpunit/PrometheusReporterTest.php
D sites/all/modules/offline2civicrm/tests/WmfImportTest.php
D sites/all/modules/orphan_slayer/tests/phpunit/OrphanSlayerTest.php
D sites/all/modules/wmf_civicrm/tests/phpunit/MergeTest.php
4 files changed, 0 insertions(+), 2,037 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/05/383905/1

diff --git 
a/sites/all/modules/metrics_reporting/tests/phpunit/PrometheusReporterTest.php 
b/sites/all/modules/metrics_reporting/tests/phpunit/PrometheusReporterTest.php
deleted file mode 100644
index 7df123f..000
--- 
a/sites/all/modules/metrics_reporting/tests/phpunit/PrometheusReporterTest.php
+++ /dev/null
@@ -1,31 +0,0 @@
- 157,
-   'orcs_befriended' => 3,
-   'prisoners_freed' => 5,
-   );
-   $reporter->reportMetrics( 'foo', $metrics );
-   $filename = $dir . DIRECTORY_SEPARATOR . 'foo' .
-   PrometheusReporter::$extension;
-   $this->assertFileExists( $filename );
-   // don't want the trailing newline
-   $written = rtrim( file_get_contents( $filename ) );
-   $split = explode( "\n", $written );
-   foreach ( $split as $metric ) {
-   list( $name, $value ) = explode( ' ', $metric );
-   $this->assertEquals( $metrics[$name], $value );
-   unset( $metrics[$name] );
-   }
-   $this->assertEmpty( $metrics, 'A metric was left unwritten' );
-   unlink( $filename );
-   rmdir( $dir );
-   }
-}
diff --git a/sites/all/modules/offline2civicrm/tests/WmfImportTest.php 
b/sites/all/modules/offline2civicrm/tests/WmfImportTest.php
deleted file mode 100644
index b1f480c..000
--- a/sites/all/modules/offline2civicrm/tests/WmfImportTest.php
+++ /dev/null
@@ -1,63 +0,0 @@
- 'Blah_source',
-   'utm_medium' => 'civicrm',
-   'utm_campaign' => 'test_campaign',
-   'ts' => wmf_common_date_unix_to_sql( time() )
-   ) );
-
-   $this->trxn_id = mt_rand();
-   $this->gateway = 'globalcollect';
-   $data = array(
-   'City' => 'blah city',
-   'Contribution Tracking ID' => $contribution_tracking_id,
-   'Country' => 'AR',
-   'Email' => 'em...@phony.com',
-   'External Batch Number' => mt_rand(),
-   'First Name' => 'Test_first_name',
-   'Gift Source' => 'Community GIft',
-   'Last Name' => 'Test_last_name',
-   'Original Amount' => '123',
-   'Original Currency' => 'USD',
-   'Payment Gateway' => $this->gateway,
-   'Payment Instrument' => 'Cash',
-   'Postal Code' => '90210',
-   'Postmark Date' => '2012-02-02',
-   'Received Date' => '2017-07-07',
-   'State' => 'CA',
-   'Street Address' => '123 Sunset Boulevard',
-   'Transaction ID' => $this->trxn_id,
-   );
-   $importer = new WmfImportFile( "no URI" );
-   $exposed = TestingAccessWrapper::newFromObject( $importer );
-   $message = $exposed->parseRow( $data );
-   $exposed->doImport( $message );
-   $contributions = wmf_civicrm_get_contributions_from_gateway_id(
-   $this->gateway, $this->trxn_id
-   );
-   $this->assertEquals( 1, count( $contributions ) );
-   $contribution = $contributions[0];
-   $this->assertEquals( $this->gateway, $contribution['gateway'] );
-   $ct = db_select( 'contribution_tracking', 
'contribution_tracking' )
-   ->fields( 'contribution_tracking' )
-   ->condition( 'id', $contribution_tracking_id )
-   ->execute()
-   ->fetchAssoc();
-   $this->assertEquals( $contribution['id'], 
$ct['contribution_id'] );
-   // TODO: should update existing c_t row with country!
-   // 

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/382622 )

Change subject: Merge branch 'master' into deployment
..


Merge branch 'master' into deployment

926986a73 T177230 Thank you letter update
6d603f117 Update CiviCRM submodule

Change-Id: I88dbf604cd5eef40567eab63e652449d27a8c463
---
0 files changed, 0 insertions(+), 0 deletions(-)

Approvals:
  jenkins-bot: Verified
  Ejegg: Looks good to me, approved




-- 
To view, visit https://gerrit.wikimedia.org/r/382622
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I88dbf604cd5eef40567eab63e652449d27a8c463
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

[Ejegg (Code Review)]

Ejegg has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/382622 )

Change subject: Merge branch 'master' into deployment
..

Merge branch 'master' into deployment

926986a73 T177230 Thank you letter update
6d603f117 Update CiviCRM submodule

Change-Id: I88dbf604cd5eef40567eab63e652449d27a8c463
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/22/382622/1


-- 
To view, visit https://gerrit.wikimedia.org/r/382622
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I88dbf604cd5eef40567eab63e652449d27a8c463
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/382607 )

Change subject: Merge branch 'master' into deployment
..


Merge branch 'master' into deployment

5cd9defa5 Report average consumed message age
abfb6de6c Report average thank you mail delay

Change-Id: I98248d6c954b6e39f2bdbc4ad6c3650727b00e3a
---
0 files changed, 0 insertions(+), 0 deletions(-)

Approvals:
  jenkins-bot: Verified
  Ejegg: Looks good to me, approved




-- 
To view, visit https://gerrit.wikimedia.org/r/382607
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I98248d6c954b6e39f2bdbc4ad6c3650727b00e3a
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

[Ejegg (Code Review)]

Ejegg has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/382607 )

Change subject: Merge branch 'master' into deployment
..

Merge branch 'master' into deployment

5cd9defa5 Report average consumed message age
abfb6de6c Report average thank you mail delay

Change-Id: I98248d6c954b6e39f2bdbc4ad6c3650727b00e3a
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/07/382607/1


-- 
To view, visit https://gerrit.wikimedia.org/r/382607
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I98248d6c954b6e39f2bdbc4ad6c3650727b00e3a
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/381506 )

Change subject: Merge branch 'master' into deployment
..


Merge branch 'master' into deployment

aced85668 Prefer 'invoice_id' to 'order_id' for importing invoice_id
387622b8d Fix bone-headed errors in duplicate invoice handling

Change-Id: I701cf235e3ec80b3c2f5a88f1fe56ea85b2de665
---
D sites/all/modules/queue2civicrm/tests/includes/Message.php
D sites/all/modules/queue2civicrm/tests/phpunit/DonationQueueTest.php
2 files changed, 0 insertions(+), 615 deletions(-)

Approvals:
  jenkins-bot: Verified
  Ejegg: Looks good to me, approved



diff --git a/sites/all/modules/queue2civicrm/tests/includes/Message.php 
b/sites/all/modules/queue2civicrm/tests/includes/Message.php
deleted file mode 100644
index be88b24..000
--- a/sites/all/modules/queue2civicrm/tests/includes/Message.php
+++ /dev/null
@@ -1,164 +0,0 @@
-<<< HEAD   (784756 Merge branch 'master' into deployment)
-===
-data = $this->defaults;
-$this->set( $values );
-}
-
-function set( $values ) {
-if ( is_array( $values ) ) {
-$this->data = $values + $this->data;
-}
-
-$this->body = json_encode( $this->data );
-}
-
-function getBody() {
-return $this->data;
-}
-
-function loadDefaults( $name ) {
-if ( !$this->defaults ) {
-$path = __DIR__ . "/../data/{$name}.json";
-$this->defaults = json_decode( file_get_contents( $path ), true );
-}
-}
-
-/**
- * Generates random data for queue and donation insertion testing
- */
-public static function generateRandom() {
-//language codes
-$lang = array( 'en', 'de', 'fr' );
-
-$currency_codes = array( 'USD', 'GBP', 'EUR', 'ILS' );
-shuffle( $currency_codes );
-$currency = ( mt_rand( 0, 1 ) ) ? 'USD' : $currency_codes[0];
-
-$message = array(
-'contribution_tracking_id' => '',
-'optout' => mt_rand( 0, 1 ),
-'anonymous' => mt_rand( 0, 1 ),
-'comment' => mt_rand(),
-'utm_source' => mt_rand(),
-'utm_medium' => mt_rand(),
-'utm_campaign' => mt_rand(),
-'language' => $lang[array_rand( $lang )],
-'email' => mt_rand() . '@example.com',
-'first_name' => mt_rand(),
-'middle_name' => mt_rand(),
-'last_name' => mt_rand(),
-'street_address' => mt_rand(),
-'supplemental_address_1' => '',
-'city' => 'San Francisco',
-'state_province' => 'CA',
-'country' => 'USA',
-'countryID' => 'US',
-'postal_code' => mt_rand( 2801, 9 ),
-'gateway' => 'insert_test',
-'gateway_txn_id' => mt_rand(),
-'response' => mt_rand(),
-'currency' => $currency,
-'original_currency' => $currency_codes[0],
-'original_gross' => mt_rand( 0, 1 ) / 100,
-'fee' => '0',
-'gross' => mt_rand( 0, 1 ) / 100,
-'net' => mt_rand( 0, 1 ) / 100,
-'date' => date( 'r' ), //time(),
-);
-return $message;
-}
-}
-
-class TransactionMessage extends Message {
-protected $txn_id_key = 'gateway_txn_id';
-
-function __construct( $values = array() ) {
-$this->loadDefaults( "donation" );
-$ct_id = mt_rand();
-
-parent::__construct( $values + array(
-$this->txn_id_key => mt_rand(),
-'order_id' => "$ct_id.1",
-'contribution_tracking_id' => $ct_id,
-) );
-}
-
-function getGateway() {
-return $this->data['gateway'];
-}
-
-function getGatewayTxnId() {
-return $this->data[$this->txn_id_key];
-}
-
-function get( $key ) {
-return $this->data[$key];
-}
-}
-
-class RefundMessage extends TransactionMessage {
-function __construct( $values = array() ) {
-$this->loadDefaults( "refund" );
-
-$this->txn_id_key = 'gateway_refund_id';
-
-parent::__construct( $values );
-}
-}
-
-class RecurringPaymentMessage extends TransactionMessage {
-function __construct( $values = array() ) {
-$this->loadDefaults( "recurring_payment" );
-
-$this->txn_id_key = 'gateway_txn_id';
-
-parent::__construct( $values );
-}
-}
-
-class RecurringSignupMessage extends TransactionMessage {
-function __construct( $values = array() ) {
-$this->loadDefaults( "recurring_signup" );
-
-parent::__construct( $values );
-}
-}
-
-/**
- * Class AmazonDonationMessage Sparse message format pointing to donor
- *  details in the pending database
- */
-class AmazonDonationMessage extends TransactionMessage {
-   function __construct( $values = array() ) {
-   $this->loadDefaults( 

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

[Ejegg (Code Review)]

Ejegg has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/381506 )

Change subject: Merge branch 'master' into deployment
..

Merge branch 'master' into deployment

aced85668 Prefer 'invoice_id' to 'order_id' for importing invoice_id
387622b8d Fix bone-headed errors in duplicate invoice handling

Change-Id: I701cf235e3ec80b3c2f5a88f1fe56ea85b2de665
---
D sites/all/modules/queue2civicrm/tests/includes/Message.php
D sites/all/modules/queue2civicrm/tests/phpunit/DonationQueueTest.php
2 files changed, 0 insertions(+), 615 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/06/381506/1

diff --git a/sites/all/modules/queue2civicrm/tests/includes/Message.php 
b/sites/all/modules/queue2civicrm/tests/includes/Message.php
deleted file mode 100644
index be88b24..000
--- a/sites/all/modules/queue2civicrm/tests/includes/Message.php
+++ /dev/null
@@ -1,164 +0,0 @@
-<<< HEAD   (784756 Merge branch 'master' into deployment)
-===
-data = $this->defaults;
-$this->set( $values );
-}
-
-function set( $values ) {
-if ( is_array( $values ) ) {
-$this->data = $values + $this->data;
-}
-
-$this->body = json_encode( $this->data );
-}
-
-function getBody() {
-return $this->data;
-}
-
-function loadDefaults( $name ) {
-if ( !$this->defaults ) {
-$path = __DIR__ . "/../data/{$name}.json";
-$this->defaults = json_decode( file_get_contents( $path ), true );
-}
-}
-
-/**
- * Generates random data for queue and donation insertion testing
- */
-public static function generateRandom() {
-//language codes
-$lang = array( 'en', 'de', 'fr' );
-
-$currency_codes = array( 'USD', 'GBP', 'EUR', 'ILS' );
-shuffle( $currency_codes );
-$currency = ( mt_rand( 0, 1 ) ) ? 'USD' : $currency_codes[0];
-
-$message = array(
-'contribution_tracking_id' => '',
-'optout' => mt_rand( 0, 1 ),
-'anonymous' => mt_rand( 0, 1 ),
-'comment' => mt_rand(),
-'utm_source' => mt_rand(),
-'utm_medium' => mt_rand(),
-'utm_campaign' => mt_rand(),
-'language' => $lang[array_rand( $lang )],
-'email' => mt_rand() . '@example.com',
-'first_name' => mt_rand(),
-'middle_name' => mt_rand(),
-'last_name' => mt_rand(),
-'street_address' => mt_rand(),
-'supplemental_address_1' => '',
-'city' => 'San Francisco',
-'state_province' => 'CA',
-'country' => 'USA',
-'countryID' => 'US',
-'postal_code' => mt_rand( 2801, 9 ),
-'gateway' => 'insert_test',
-'gateway_txn_id' => mt_rand(),
-'response' => mt_rand(),
-'currency' => $currency,
-'original_currency' => $currency_codes[0],
-'original_gross' => mt_rand( 0, 1 ) / 100,
-'fee' => '0',
-'gross' => mt_rand( 0, 1 ) / 100,
-'net' => mt_rand( 0, 1 ) / 100,
-'date' => date( 'r' ), //time(),
-);
-return $message;
-}
-}
-
-class TransactionMessage extends Message {
-protected $txn_id_key = 'gateway_txn_id';
-
-function __construct( $values = array() ) {
-$this->loadDefaults( "donation" );
-$ct_id = mt_rand();
-
-parent::__construct( $values + array(
-$this->txn_id_key => mt_rand(),
-'order_id' => "$ct_id.1",
-'contribution_tracking_id' => $ct_id,
-) );
-}
-
-function getGateway() {
-return $this->data['gateway'];
-}
-
-function getGatewayTxnId() {
-return $this->data[$this->txn_id_key];
-}
-
-function get( $key ) {
-return $this->data[$key];
-}
-}
-
-class RefundMessage extends TransactionMessage {
-function __construct( $values = array() ) {
-$this->loadDefaults( "refund" );
-
-$this->txn_id_key = 'gateway_refund_id';
-
-parent::__construct( $values );
-}
-}
-
-class RecurringPaymentMessage extends TransactionMessage {
-function __construct( $values = array() ) {
-$this->loadDefaults( "recurring_payment" );
-
-$this->txn_id_key = 'gateway_txn_id';
-
-parent::__construct( $values );
-}
-}
-
-class RecurringSignupMessage extends TransactionMessage {
-function __construct( $values = array() ) {
-$this->loadDefaults( "recurring_signup" );
-
-parent::__construct( $values );
-}
-}
-
-/**
- * Class AmazonDonationMessage Sparse message format pointing to donor
- *  details in the pending database
- */
-class AmazonDonationMessage extends TransactionMessage {
-   function __construct( $values = array() ) {
-   

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/381366 )

Change subject: Merge branch 'master' into deployment
..


Merge branch 'master' into deployment

d6c0e44d5 Delete redundant logging module
fcf20bf51 Don't clobber contribution_tracking in makemissing mode

Change-Id: I0b818013c8dae281628a132e25be40bdaad36ce2
---
0 files changed, 0 insertions(+), 0 deletions(-)

Approvals:
  jenkins-bot: Verified
  Ejegg: Looks good to me, approved




-- 
To view, visit https://gerrit.wikimedia.org/r/381366
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I0b818013c8dae281628a132e25be40bdaad36ce2
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

[Ejegg (Code Review)]

Ejegg has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/381366 )

Change subject: Merge branch 'master' into deployment
..

Merge branch 'master' into deployment

d6c0e44d5 Delete redundant logging module
fcf20bf51 Don't clobber contribution_tracking in makemissing mode

Change-Id: I0b818013c8dae281628a132e25be40bdaad36ce2
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/66/381366/1


-- 
To view, visit https://gerrit.wikimedia.org/r/381366
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0b818013c8dae281628a132e25be40bdaad36ce2
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/381355 )

Change subject: Merge branch 'master' into deployment
..


Merge branch 'master' into deployment

33bb710ce CiviFixtures cleans up after itself better
45a8dad0f Duplicate invoice special handling in message requeue
bb236a869 WmfDatabase: Rollback all if Civi txn marked for rollback
d57689655 When updating an email return early on email match, set on_hold to 0 
if email is not on hold in DB already.
b27179c18 Add test for Exception Rollback
0248b45c7 Update CiviCRM submodule for dedupe limit

Change-Id: Id90953097606d74a8da34440c41c42bd90547941
---
D sites/all/modules/wmf_civicrm/tests/includes/CiviFixtures.php
D sites/all/modules/wmf_civicrm/tests/phpunit/ImportMessageTest.php
D sites/all/modules/wmf_common/tests/phpunit/WmfTransactionTest.php
3 files changed, 0 insertions(+), 1,005 deletions(-)

Approvals:
  jenkins-bot: Verified
  Ejegg: Looks good to me, approved



diff --git a/sites/all/modules/wmf_civicrm/tests/includes/CiviFixtures.php 
b/sites/all/modules/wmf_civicrm/tests/includes/CiviFixtures.php
deleted file mode 100644
index e17aeae..000
--- a/sites/all/modules/wmf_civicrm/tests/includes/CiviFixtures.php
+++ /dev/null
@@ -1,113 +0,0 @@
-<<< HEAD   (3f48cb Merge branch 'master' into deployment)
-===
- 'Individual',
-  'first_name' => 'Test',
-  'last_name' => 'Es'
-));
-$out->contact_id = $individual['id'];
-
-$out->org_contact_name = 'Test DAF ' . mt_rand();
-
-$organization = civicrm_api3('Contact', 'Create', array(
-  'contact_type' => 'Organization',
-  'organization_name' => $out->org_contact_name,
-));
-$out->org_contact_id = $organization['id'];
-
-$out->recur_amount = '2.34';
-$out->subscription_id = 'SUB-' . mt_rand();
-$out->epoch_time = time();
-$out->sql_time = wmf_common_date_unix_to_sql( $out->epoch_time );
-
-$subscription_params = array(
-'contact_id' => $out->contact_id,
-'amount' => $out->recur_amount,
-'currency' => 'USD',
-'frequency_unit' => 'month',
-'frequency_interval' => '1',
-'installments' => '0',
-'start_date' => wmf_common_date_unix_to_civicrm( $out->epoch_time 
),
-'create_date' => wmf_common_date_unix_to_civicrm( $out->epoch_time 
),
-'cancel_date' => null,
-'processor_id' => 1,
-'cycle_day' => '1',
-'next_sched_contribution' => null,
-'trxn_id' => "RECURRING TEST_GATEWAY {$out->subscription_id}-1 
{$out->epoch_time}",
-
-'version' => 3,
-);
-$contributionRecur = civicrm_api3('ContributionRecur', 'Create', 
$subscription_params);
-$out->contribution_recur_id = $contributionRecur['id'];
-
-$out->contact_group_name = 'test_thrilled_demographic';
-$group = civicrm_api3('Group', 'get', array('title' => 
$out->contact_group_name));
-
-if ($group['count'] === 1 ) {
-$out->contact_group_id = $group['id'];
-} else {
-$group = civicrm_api3('Group', 'create', array(
-  'title' => $out->contact_group_name,
-  'name' => $out->contact_group_name,
-));
-$out->contact_group_id = $group['id'];
-}
-
-$out->contribution_amount = '1.00';
-
-$contribution_params = array(
-'contact_id' => $out->contact_id,
-'amount' => $out->contribution_amount,
-'total_amount' => $out->contribution_amount,
-'create_date' => wmf_common_date_unix_to_civicrm( $out->epoch_time 
),
-'financial_type_id' => 1,
-'invoice_id' => mt_rand(),
-);
-$contribution = civicrm_api3('Contribution', 'Create', 
$contribution_params);
-   $out->contribution_id = $contribution['id'];
-$contribution_values = $contribution['values'][$out->contribution_id];
-$out->contribution_invoice_id = $contribution_values['invoice_id'];
-
-   (new CRM_Core_Transaction())->commit();
-return $out;
-}
-
-  /**
-   * Tear down function.
-   */
-public function __destruct() {
-civicrm_api3('ContributionRecur', 'delete', array('id' => 
$this->contribution_recur_id));
-   civicrm_api3('Contribution', 'delete', array('id' => 
$this->contribution_id));
-civicrm_api3('Contact', 'delete', array('id' => $this->contact_id));
-}
-}
->>> BRANCH (0248b4 Update CiviCRM submodule for dedupe limit)
diff --git a/sites/all/modules/wmf_civicrm/tests/phpunit/ImportMessageTest.php 
b/sites/all/modules/wmf_civicrm/tests/phpunit/ImportMessageTest.php
deleted file mode 100644
index cdc96c8..000
--- a/sites/all/modules/wmf_civicrm/tests/phpunit/ImportMessageTest.php
+++ 

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

[Ejegg (Code Review)]

Ejegg has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/381355 )

Change subject: Merge branch 'master' into deployment
..

Merge branch 'master' into deployment

33bb710ce CiviFixtures cleans up after itself better
45a8dad0f Duplicate invoice special handling in message requeue
bb236a869 WmfDatabase: Rollback all if Civi txn marked for rollback
d57689655 When updating an email return early on email match, set on_hold to 0 
if email is not on hold in DB already.
b27179c18 Add test for Exception Rollback
0248b45c7 Update CiviCRM submodule for dedupe limit

Change-Id: Id90953097606d74a8da34440c41c42bd90547941
---
D sites/all/modules/wmf_civicrm/tests/includes/CiviFixtures.php
D sites/all/modules/wmf_civicrm/tests/phpunit/ImportMessageTest.php
D sites/all/modules/wmf_common/tests/phpunit/WmfTransactionTest.php
3 files changed, 0 insertions(+), 1,005 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/55/381355/1

diff --git a/sites/all/modules/wmf_civicrm/tests/includes/CiviFixtures.php 
b/sites/all/modules/wmf_civicrm/tests/includes/CiviFixtures.php
deleted file mode 100644
index e17aeae..000
--- a/sites/all/modules/wmf_civicrm/tests/includes/CiviFixtures.php
+++ /dev/null
@@ -1,113 +0,0 @@
-<<< HEAD   (3f48cb Merge branch 'master' into deployment)
-===
- 'Individual',
-  'first_name' => 'Test',
-  'last_name' => 'Es'
-));
-$out->contact_id = $individual['id'];
-
-$out->org_contact_name = 'Test DAF ' . mt_rand();
-
-$organization = civicrm_api3('Contact', 'Create', array(
-  'contact_type' => 'Organization',
-  'organization_name' => $out->org_contact_name,
-));
-$out->org_contact_id = $organization['id'];
-
-$out->recur_amount = '2.34';
-$out->subscription_id = 'SUB-' . mt_rand();
-$out->epoch_time = time();
-$out->sql_time = wmf_common_date_unix_to_sql( $out->epoch_time );
-
-$subscription_params = array(
-'contact_id' => $out->contact_id,
-'amount' => $out->recur_amount,
-'currency' => 'USD',
-'frequency_unit' => 'month',
-'frequency_interval' => '1',
-'installments' => '0',
-'start_date' => wmf_common_date_unix_to_civicrm( $out->epoch_time 
),
-'create_date' => wmf_common_date_unix_to_civicrm( $out->epoch_time 
),
-'cancel_date' => null,
-'processor_id' => 1,
-'cycle_day' => '1',
-'next_sched_contribution' => null,
-'trxn_id' => "RECURRING TEST_GATEWAY {$out->subscription_id}-1 
{$out->epoch_time}",
-
-'version' => 3,
-);
-$contributionRecur = civicrm_api3('ContributionRecur', 'Create', 
$subscription_params);
-$out->contribution_recur_id = $contributionRecur['id'];
-
-$out->contact_group_name = 'test_thrilled_demographic';
-$group = civicrm_api3('Group', 'get', array('title' => 
$out->contact_group_name));
-
-if ($group['count'] === 1 ) {
-$out->contact_group_id = $group['id'];
-} else {
-$group = civicrm_api3('Group', 'create', array(
-  'title' => $out->contact_group_name,
-  'name' => $out->contact_group_name,
-));
-$out->contact_group_id = $group['id'];
-}
-
-$out->contribution_amount = '1.00';
-
-$contribution_params = array(
-'contact_id' => $out->contact_id,
-'amount' => $out->contribution_amount,
-'total_amount' => $out->contribution_amount,
-'create_date' => wmf_common_date_unix_to_civicrm( $out->epoch_time 
),
-'financial_type_id' => 1,
-'invoice_id' => mt_rand(),
-);
-$contribution = civicrm_api3('Contribution', 'Create', 
$contribution_params);
-   $out->contribution_id = $contribution['id'];
-$contribution_values = $contribution['values'][$out->contribution_id];
-$out->contribution_invoice_id = $contribution_values['invoice_id'];
-
-   (new CRM_Core_Transaction())->commit();
-return $out;
-}
-
-  /**
-   * Tear down function.
-   */
-public function __destruct() {
-civicrm_api3('ContributionRecur', 'delete', array('id' => 
$this->contribution_recur_id));
-   civicrm_api3('Contribution', 'delete', array('id' => 
$this->contribution_id));
-civicrm_api3('Contact', 'delete', array('id' => $this->contact_id));
-}
-}
->>> BRANCH (0248b4 Update CiviCRM submodule for dedupe limit)
diff --git a/sites/all/modules/wmf_civicrm/tests/phpunit/ImportMessageTest.php 
b/sites/all/modules/wmf_civicrm/tests/phpunit/ImportMessageTest.php
deleted file mode 100644
index cdc96c8..000
--- a/sites/all/modules/wmf_civicrm/tests/phpunit/ImportMessageTest.php

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/380803 )

Change subject: Merge branch 'master' into deployment
..


Merge branch 'master' into deployment

de5162a Don't call getErrorCode on ValidationError
e14cf03 Delete ganglia_reporter, use new module
209b617 Latest updates to civicrm
3a89222 Prometheus: add extension, update default dir

Change-Id: I336e38e857b9c9d771405caedb4529a4175e1170
---
D sites/all/modules/ganglia_reporter/ganglia_reporter.info
M sites/all/modules/metrics_reporting/tests/phpunit/PrometheusReporterTest.php
2 files changed, 0 insertions(+), 11 deletions(-)

Approvals:
  Mepps: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/sites/all/modules/ganglia_reporter/ganglia_reporter.info 
b/sites/all/modules/ganglia_reporter/ganglia_reporter.info
deleted file mode 100644
index 41d1124..000
--- a/sites/all/modules/ganglia_reporter/ganglia_reporter.info
+++ /dev/null
@@ -1,8 +0,0 @@
-<<< HEAD   (89b800 Merge branch 'master' into deployment)
-name = Ganglia Reporter
-description = Reports metrics to Ganglia 
-core = 7.x
-configure = admin/config/ganglia_reporter/configure
-files[] = GangliaReporter.php
-===
->>> BRANCH (2f0028 Merge "Prometheus: add extension, update default dir")
diff --git 
a/sites/all/modules/metrics_reporting/tests/phpunit/PrometheusReporterTest.php 
b/sites/all/modules/metrics_reporting/tests/phpunit/PrometheusReporterTest.php
index 98a83f0..7df123f 100644
--- 
a/sites/all/modules/metrics_reporting/tests/phpunit/PrometheusReporterTest.php
+++ 
b/sites/all/modules/metrics_reporting/tests/phpunit/PrometheusReporterTest.php
@@ -1,5 +1,3 @@
-<<< HEAD   (89b800 Merge branch 'master' into deployment)
-===
 >> BRANCH (2f0028 Merge "Prometheus: add extension, update default dir")

-- 
To view, visit https://gerrit.wikimedia.org/r/380803
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I336e38e857b9c9d771405caedb4529a4175e1170
Gerrit-PatchSet: 2
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Mepps 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: Mepps 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

[Mepps (Code Review)]

Mepps has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/380803 )

Change subject: Merge branch 'master' into deployment
..

Merge branch 'master' into deployment

Change-Id: I336e38e857b9c9d771405caedb4529a4175e1170
---
D sites/all/modules/ganglia_reporter/ganglia_reporter.info
M sites/all/modules/metrics_reporting/tests/phpunit/PrometheusReporterTest.php
2 files changed, 0 insertions(+), 11 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/03/380803/1

diff --git a/sites/all/modules/ganglia_reporter/ganglia_reporter.info 
b/sites/all/modules/ganglia_reporter/ganglia_reporter.info
deleted file mode 100644
index 41d1124..000
--- a/sites/all/modules/ganglia_reporter/ganglia_reporter.info
+++ /dev/null
@@ -1,8 +0,0 @@
-<<< HEAD   (89b800 Merge branch 'master' into deployment)
-name = Ganglia Reporter
-description = Reports metrics to Ganglia 
-core = 7.x
-configure = admin/config/ganglia_reporter/configure
-files[] = GangliaReporter.php
-===
->>> BRANCH (2f0028 Merge "Prometheus: add extension, update default dir")
diff --git 
a/sites/all/modules/metrics_reporting/tests/phpunit/PrometheusReporterTest.php 
b/sites/all/modules/metrics_reporting/tests/phpunit/PrometheusReporterTest.php
index 98a83f0..7df123f 100644
--- 
a/sites/all/modules/metrics_reporting/tests/phpunit/PrometheusReporterTest.php
+++ 
b/sites/all/modules/metrics_reporting/tests/phpunit/PrometheusReporterTest.php
@@ -1,5 +1,3 @@
-<<< HEAD   (89b800 Merge branch 'master' into deployment)
-===
 >> BRANCH (2f0028 Merge "Prometheus: add extension, update default dir")

-- 
To view, visit https://gerrit.wikimedia.org/r/380803
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I336e38e857b9c9d771405caedb4529a4175e1170
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Mepps 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/380567 )

Change subject: Merge branch 'master' into deployment
..


Merge branch 'master' into deployment

8d2491ebd Omnimail recipient job: Follow up fix on suffix
bfb2a02ac Omnimail recipient - further fixes to batching.
437b9c9e0 Prometheus metrics reporting
3b5030560 Update FR thank you email

Change-Id: Ieb919206336258bb374373f21bcd6862ded51608
---
D phpunit.xml
D sites/all/modules/metrics_reporting/tests/phpunit/PrometheusReporterTest.php
2 files changed, 0 insertions(+), 86 deletions(-)

Approvals:
  jenkins-bot: Verified
  Ejegg: Looks good to me, approved



diff --git a/phpunit.xml b/phpunit.xml
deleted file mode 100644
index de69c07..000
--- a/phpunit.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<<< HEAD   (45c56c Merge branch 'master' into deployment)
-===
-http://www.w3.org/2001/XMLSchema-instance;
-xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/3.7/phpunit.xsd;
-bootstrap="sites/default/bootstrap-phpunit.php">
-
-
-
-  
-sites/all/modules/large_donation/tests
-  
-  
-sites/all/modules/offline2civicrm/tests
-
sites/all/modules/offline2civicrm/tests/includes/BaseChecksFileTest.php
-  
-  
-sites/all/modules/exchange_rates/tests/phpunit
-  
-  
-
sites/all/modules/metrics_reporting/tests/phpunit
-  
-  
-sites/all/modules/orphan_slayer/tests/phpunit
-  
-  
-sites/all/modules/queue2civicrm/tests/phpunit
-  
-  
-sites/all/modules/recurring_globalcollect/tests
-  
-  
-sites/all/modules/thank_you/tests/phpunit
-  
-  
-sites/all/modules/wmf_audit/tests
-  
-  
-sites/all/modules/wmf_campaigns/tests
-  
-  
-sites/all/modules/wmf_civicrm/tests/phpunit
-  
-  
-sites/all/modules/wmf_common/tests/phpunit
-  
-  
-
sites/all/modules/wmf_communication/tests/phpunit
-
sites/all/modules/wmf_communication/tests/phpunit/CiviMailTestBase.php
-  
-  
-
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit
-  
-
-
->>> BRANCH (3b5030 Update FR thank you email)
diff --git 
a/sites/all/modules/metrics_reporting/tests/phpunit/PrometheusReporterTest.php 
b/sites/all/modules/metrics_reporting/tests/phpunit/PrometheusReporterTest.php
deleted file mode 100644
index 3f489db..000
--- 
a/sites/all/modules/metrics_reporting/tests/phpunit/PrometheusReporterTest.php
+++ /dev/null
@@ -1,30 +0,0 @@
- 157,
-   'orcs_befriended' => 3,
-   'prisoners_freed' => 5,
-   );
-   $reporter->reportMetrics( 'foo', $metrics );
-   $filename = $dir . DIRECTORY_SEPARATOR . 'foo';
-   $this->assertFileExists( $filename );
-   // don't want the trailing newline
-   $written = rtrim( file_get_contents( $filename ) );
-   $split = explode( "\n", $written );
-   foreach ( $split as $metric ) {
-   list( $name, $value ) = explode( ' ', $metric );
-   $this->assertEquals( $metrics[$name], $value );
-   unset( $metrics[$name] );
-   }
-   $this->assertEmpty( $metrics, 'A metric was left unwritten' );
-   unlink( $filename );
-   rmdir( $dir );
-   }
-}

-- 
To view, visit https://gerrit.wikimedia.org/r/380567
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ieb919206336258bb374373f21bcd6862ded51608
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

[Ejegg (Code Review)]

Ejegg has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/380567 )

Change subject: Merge branch 'master' into deployment
..

Merge branch 'master' into deployment

8d2491ebd Omnimail recipient job: Follow up fix on suffix
bfb2a02ac Omnimail recipient - further fixes to batching.
437b9c9e0 Prometheus metrics reporting
3b5030560 Update FR thank you email

Change-Id: Ieb919206336258bb374373f21bcd6862ded51608
---
D phpunit.xml
D sites/all/modules/metrics_reporting/tests/phpunit/PrometheusReporterTest.php
2 files changed, 0 insertions(+), 86 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/67/380567/1

diff --git a/phpunit.xml b/phpunit.xml
deleted file mode 100644
index de69c07..000
--- a/phpunit.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<<< HEAD   (45c56c Merge branch 'master' into deployment)
-===
-http://www.w3.org/2001/XMLSchema-instance;
-xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/3.7/phpunit.xsd;
-bootstrap="sites/default/bootstrap-phpunit.php">
-
-
-
-  
-sites/all/modules/large_donation/tests
-  
-  
-sites/all/modules/offline2civicrm/tests
-
sites/all/modules/offline2civicrm/tests/includes/BaseChecksFileTest.php
-  
-  
-sites/all/modules/exchange_rates/tests/phpunit
-  
-  
-
sites/all/modules/metrics_reporting/tests/phpunit
-  
-  
-sites/all/modules/orphan_slayer/tests/phpunit
-  
-  
-sites/all/modules/queue2civicrm/tests/phpunit
-  
-  
-sites/all/modules/recurring_globalcollect/tests
-  
-  
-sites/all/modules/thank_you/tests/phpunit
-  
-  
-sites/all/modules/wmf_audit/tests
-  
-  
-sites/all/modules/wmf_campaigns/tests
-  
-  
-sites/all/modules/wmf_civicrm/tests/phpunit
-  
-  
-sites/all/modules/wmf_common/tests/phpunit
-  
-  
-
sites/all/modules/wmf_communication/tests/phpunit
-
sites/all/modules/wmf_communication/tests/phpunit/CiviMailTestBase.php
-  
-  
-
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit
-  
-
-
->>> BRANCH (3b5030 Update FR thank you email)
diff --git 
a/sites/all/modules/metrics_reporting/tests/phpunit/PrometheusReporterTest.php 
b/sites/all/modules/metrics_reporting/tests/phpunit/PrometheusReporterTest.php
deleted file mode 100644
index 3f489db..000
--- 
a/sites/all/modules/metrics_reporting/tests/phpunit/PrometheusReporterTest.php
+++ /dev/null
@@ -1,30 +0,0 @@
- 157,
-   'orcs_befriended' => 3,
-   'prisoners_freed' => 5,
-   );
-   $reporter->reportMetrics( 'foo', $metrics );
-   $filename = $dir . DIRECTORY_SEPARATOR . 'foo';
-   $this->assertFileExists( $filename );
-   // don't want the trailing newline
-   $written = rtrim( file_get_contents( $filename ) );
-   $split = explode( "\n", $written );
-   foreach ( $split as $metric ) {
-   list( $name, $value ) = explode( ' ', $metric );
-   $this->assertEquals( $metrics[$name], $value );
-   unset( $metrics[$name] );
-   }
-   $this->assertEmpty( $metrics, 'A metric was left unwritten' );
-   unlink( $filename );
-   rmdir( $dir );
-   }
-}

-- 
To view, visit https://gerrit.wikimedia.org/r/380567
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ieb919206336258bb374373f21bcd6862ded51608
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/379650 )

Change subject: Merge branch 'master' into deployment
..


Merge branch 'master' into deployment

3bbac063c Remove unnecessary trigger refresh
0ca9c3be3 Retry deadlocked inserts, take two
77c0722c8 Use permissions hook to prevent unlimited dedupe
a4bb77929 Submodule update

Change-Id: Ic978420bc039044b8d9ee19030541f1acedca5c8
---
D sites/all/modules/wmf_civicrm/tests/phpunit/PhoneImportTest.php
1 file changed, 0 insertions(+), 39 deletions(-)

Approvals:
  jenkins-bot: Verified
  Ejegg: Looks good to me, approved



diff --git a/sites/all/modules/wmf_civicrm/tests/phpunit/PhoneImportTest.php 
b/sites/all/modules/wmf_civicrm/tests/phpunit/PhoneImportTest.php
deleted file mode 100644
index da9f432..000
--- a/sites/all/modules/wmf_civicrm/tests/phpunit/PhoneImportTest.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<<< HEAD   (fc5690 Update vendor for Omnimail offset fix)
-===
- 'USD',
-'date' => time(),
-'email' => 'nob...@wikimedia.org',
-'gateway' => 'test_gateway',
-'gateway_txn_id' => mt_rand(),
-'gross' => '1.23',
-'payment_method' => 'cc',
-'phone' => $phoneNumber,
-);
-
-$contribution = wmf_civicrm_contribution_message_import( $msg );
-
-$phones = $this->callAPISuccess('Phone', 'get', array('contact_id' => 
$contribution['contact_id'], 'sequential' => 1));
-$phone = $phones['values'][0];
-
-$this->assertEquals($phoneNumber, $phone['phone']);
-$this->assertEquals(1, $phone['is_primary']);
-$this->assertEquals(wmf_civicrm_get_default_location_type_id(), 
$phone['location_type_id']);
-
$this->assertEquals(CRM_Core_PseudoConstant::getKey('CRM_Core_BAO_Phone', 
'phone_type_id', 'Phone'), $phone['phone_type_id']);
-}
-
-}
->>> BRANCH (a4bb77 Submodule update)

-- 
To view, visit https://gerrit.wikimedia.org/r/379650
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic978420bc039044b8d9ee19030541f1acedca5c8
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

[Ejegg (Code Review)]

Ejegg has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/379650 )

Change subject: Merge branch 'master' into deployment
..

Merge branch 'master' into deployment

3bbac063c Remove unnecessary trigger refresh
0ca9c3be3 Retry deadlocked inserts, take two
77c0722c8 Use permissions hook to prevent unlimited dedupe
a4bb77929 Submodule update

Change-Id: Ic978420bc039044b8d9ee19030541f1acedca5c8
---
D sites/all/modules/wmf_civicrm/tests/phpunit/PhoneImportTest.php
1 file changed, 0 insertions(+), 39 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/50/379650/1

diff --git a/sites/all/modules/wmf_civicrm/tests/phpunit/PhoneImportTest.php 
b/sites/all/modules/wmf_civicrm/tests/phpunit/PhoneImportTest.php
deleted file mode 100644
index da9f432..000
--- a/sites/all/modules/wmf_civicrm/tests/phpunit/PhoneImportTest.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<<< HEAD   (fc5690 Update vendor for Omnimail offset fix)
-===
- 'USD',
-'date' => time(),
-'email' => 'nob...@wikimedia.org',
-'gateway' => 'test_gateway',
-'gateway_txn_id' => mt_rand(),
-'gross' => '1.23',
-'payment_method' => 'cc',
-'phone' => $phoneNumber,
-);
-
-$contribution = wmf_civicrm_contribution_message_import( $msg );
-
-$phones = $this->callAPISuccess('Phone', 'get', array('contact_id' => 
$contribution['contact_id'], 'sequential' => 1));
-$phone = $phones['values'][0];
-
-$this->assertEquals($phoneNumber, $phone['phone']);
-$this->assertEquals(1, $phone['is_primary']);
-$this->assertEquals(wmf_civicrm_get_default_location_type_id(), 
$phone['location_type_id']);
-
$this->assertEquals(CRM_Core_PseudoConstant::getKey('CRM_Core_BAO_Phone', 
'phone_type_id', 'Phone'), $phone['phone_type_id']);
-}
-
-}
->>> BRANCH (a4bb77 Submodule update)

-- 
To view, visit https://gerrit.wikimedia.org/r/379650
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic978420bc039044b8d9ee19030541f1acedca5c8
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/377503 )

Change subject: Merge branch 'master' into deployment
..


Merge branch 'master' into deployment

85a1b0493 Retry deadlock / lock wait failures

Change-Id: Ib4d7cfa4c140ae319b7b593127c11c765b5cc24a
---
0 files changed, 0 insertions(+), 0 deletions(-)

Approvals:
  jenkins-bot: Verified
  Ejegg: Looks good to me, approved




-- 
To view, visit https://gerrit.wikimedia.org/r/377503
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib4d7cfa4c140ae319b7b593127c11c765b5cc24a
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

[Ejegg (Code Review)]

Ejegg has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/377503 )

Change subject: Merge branch 'master' into deployment
..

Merge branch 'master' into deployment

85a1b0493 Retry deadlock / lock wait failures

Change-Id: Ib4d7cfa4c140ae319b7b593127c11c765b5cc24a
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/03/377503/1


-- 
To view, visit https://gerrit.wikimedia.org/r/377503
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib4d7cfa4c140ae319b7b593127c11c765b5cc24a
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/376560 )

Change subject: Merge branch 'master' into deployment
..


Merge branch 'master' into deployment

56d771fa3 Update RecurringGlobalCollectTest for static traits
81fd90c27 Cancel subscription on red-flag declined
ba0266147 Fix CurrencyRates class in exchange_rates module

Change-Id: I0ff6cc1a43f3c5eb1b99189034dd85322199e17c
---
D sites/all/modules/recurring_globalcollect/tests/RecurringGlobalCollectTest.php
1 file changed, 0 insertions(+), 261 deletions(-)

Approvals:
  jenkins-bot: Verified
  Ejegg: Looks good to me, approved



diff --git 
a/sites/all/modules/recurring_globalcollect/tests/RecurringGlobalCollectTest.php
 
b/sites/all/modules/recurring_globalcollect/tests/RecurringGlobalCollectTest.php
deleted file mode 100644
index 8997599..000
--- 
a/sites/all/modules/recurring_globalcollect/tests/RecurringGlobalCollectTest.php
+++ /dev/null
@@ -1,261 +0,0 @@
-<<< HEAD   (1ee2ea Merge branch 'master' into deployment)
-===
-subscriptionId = 'SUB-FOO-' . mt_rand();
-   $this->amount = '1.12';
-
-   $this->contributions = array();
-
-   $result = civicrm_api3( 'Contact', 'create', array(
-   'first_name' => 'Testes',
-   'contact_type' => 'Individual',
-   ) );
-   $this->contactId = $result['id'];
-
-   $result = civicrm_api3( 'ContributionRecur', 'create', array(
-   'contact_id' => $this->contactId,
-   'amount' => $this->amount,
-   'frequency_interval' => 1,
-   'frequency_unit' => 'month',
-   'next_sched_contribution' => 
wmf_common_date_unix_to_civicrm(strtotime('+1 month')),
-   'installments' => 0,
-   'processor_id' => 1,
-   'currency' => 'USD',
-   'trxn_id' => "RECURRING GLOBALCOLLECT 
{$this->subscriptionId}",
-   ) );
-   $this->contributionRecurId = $result['id'];
-
-   $result = civicrm_api3( 'Contribution', 'create', array(
-   'contact_id' => $this->contactId,
-   'contribution_recur_id' => $this->contributionRecurId,
-   'currency' => 'USD',
-   'total_amount' => $this->amount,
-   'contribution_type' => 'Cash',
-   'payment_instrument' => 'Credit Card',
-   'trxn_id' => 'RECURRING GLOBALCOLLECT 
STUB_ORIG_CONTRIB-' . mt_rand(),
-   ) );
-   $this->contributions[] = $result['id'];
-   $tracking = array(
-   'utm_source' => '..rcc',
-   'utm_medium' => 'civicrm',
-   'ts' => wmf_common_date_unix_to_sql( strtotime( 'now' ) 
),
-   'contribution_id' => $result['id'],
-   );
-   TestingGlobalCollectAdapter::setDummyGatewayResponseCode( 
'recurring-OK' );
-   wmf_civicrm_insert_contribution_tracking( $tracking );
-   }
-
-   public function tearDown() {
-   parent::tearDown();
-   $this->cleanUpContact( $this->contactId );
-   TestingGlobalCollectAdapter::setDummyGatewayResponseCode( null 
);
-   }
-
-   function testChargeRecorded() {
-   recurring_globalcollect_charge( $this->contributionRecurId );
-
-   $result = civicrm_api3( 'Contribution', 'get', array(
-   'contact_id' => $this->contactId,
-   ) );
-   $this->assertEquals( 2, count( $result['values'] ) );
-   foreach ( $result['values'] as $contribution ) {
-   if ( $contribution['id'] == $this->contributions[0] ) {
-   // Skip assertions on the synthetic original 
contribution
-   continue;
-   }
-
-   $this->assertEquals( 1,
-   preg_match( "/^RECURRING GLOBALCOLLECT 
{$this->subscriptionId}-2\$/", $contribution['trxn_id'] ) );
-   }
-   }
-
-   public function testRecurringCharge() {
-   $init = array(
-   'contribution_tracking_id' => mt_rand(),
-   'amount' => '2345',
-   'effort_id' => 2,
-   'order_id' => '9998890004',
-   'currency' => 'EUR',
-   'payment_method' => 'cc',
-   );
-   $gateway = DonationInterfaceFactory::createAdapter( 
'globalcollect', $init );
-
-   $result = $gateway->do_transaction( 'Recurring_Charge' );
-
-   $this->assertTrue( 

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

[Ejegg (Code Review)]

Ejegg has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/376560 )

Change subject: Merge branch 'master' into deployment
..

Merge branch 'master' into deployment

56d771fa3 Update RecurringGlobalCollectTest for static traits
81fd90c27 Cancel subscription on red-flag declined
ba0266147 Fix CurrencyRates class in exchange_rates module

Change-Id: I0ff6cc1a43f3c5eb1b99189034dd85322199e17c
---
D sites/all/modules/recurring_globalcollect/tests/RecurringGlobalCollectTest.php
1 file changed, 0 insertions(+), 261 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/60/376560/1

diff --git 
a/sites/all/modules/recurring_globalcollect/tests/RecurringGlobalCollectTest.php
 
b/sites/all/modules/recurring_globalcollect/tests/RecurringGlobalCollectTest.php
deleted file mode 100644
index 8997599..000
--- 
a/sites/all/modules/recurring_globalcollect/tests/RecurringGlobalCollectTest.php
+++ /dev/null
@@ -1,261 +0,0 @@
-<<< HEAD   (1ee2ea Merge branch 'master' into deployment)
-===
-subscriptionId = 'SUB-FOO-' . mt_rand();
-   $this->amount = '1.12';
-
-   $this->contributions = array();
-
-   $result = civicrm_api3( 'Contact', 'create', array(
-   'first_name' => 'Testes',
-   'contact_type' => 'Individual',
-   ) );
-   $this->contactId = $result['id'];
-
-   $result = civicrm_api3( 'ContributionRecur', 'create', array(
-   'contact_id' => $this->contactId,
-   'amount' => $this->amount,
-   'frequency_interval' => 1,
-   'frequency_unit' => 'month',
-   'next_sched_contribution' => 
wmf_common_date_unix_to_civicrm(strtotime('+1 month')),
-   'installments' => 0,
-   'processor_id' => 1,
-   'currency' => 'USD',
-   'trxn_id' => "RECURRING GLOBALCOLLECT 
{$this->subscriptionId}",
-   ) );
-   $this->contributionRecurId = $result['id'];
-
-   $result = civicrm_api3( 'Contribution', 'create', array(
-   'contact_id' => $this->contactId,
-   'contribution_recur_id' => $this->contributionRecurId,
-   'currency' => 'USD',
-   'total_amount' => $this->amount,
-   'contribution_type' => 'Cash',
-   'payment_instrument' => 'Credit Card',
-   'trxn_id' => 'RECURRING GLOBALCOLLECT 
STUB_ORIG_CONTRIB-' . mt_rand(),
-   ) );
-   $this->contributions[] = $result['id'];
-   $tracking = array(
-   'utm_source' => '..rcc',
-   'utm_medium' => 'civicrm',
-   'ts' => wmf_common_date_unix_to_sql( strtotime( 'now' ) 
),
-   'contribution_id' => $result['id'],
-   );
-   TestingGlobalCollectAdapter::setDummyGatewayResponseCode( 
'recurring-OK' );
-   wmf_civicrm_insert_contribution_tracking( $tracking );
-   }
-
-   public function tearDown() {
-   parent::tearDown();
-   $this->cleanUpContact( $this->contactId );
-   TestingGlobalCollectAdapter::setDummyGatewayResponseCode( null 
);
-   }
-
-   function testChargeRecorded() {
-   recurring_globalcollect_charge( $this->contributionRecurId );
-
-   $result = civicrm_api3( 'Contribution', 'get', array(
-   'contact_id' => $this->contactId,
-   ) );
-   $this->assertEquals( 2, count( $result['values'] ) );
-   foreach ( $result['values'] as $contribution ) {
-   if ( $contribution['id'] == $this->contributions[0] ) {
-   // Skip assertions on the synthetic original 
contribution
-   continue;
-   }
-
-   $this->assertEquals( 1,
-   preg_match( "/^RECURRING GLOBALCOLLECT 
{$this->subscriptionId}-2\$/", $contribution['trxn_id'] ) );
-   }
-   }
-
-   public function testRecurringCharge() {
-   $init = array(
-   'contribution_tracking_id' => mt_rand(),
-   'amount' => '2345',
-   'effort_id' => 2,
-   'order_id' => '9998890004',
-   'currency' => 'EUR',
-   'payment_method' => 'cc',
-   );
-   $gateway = DonationInterfaceFactory::createAdapter( 
'globalcollect', $init );
-
-   $result = $gateway->do_transaction( 'Recurring_Charge' );
-
-   $this->assertTrue( 

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/376545 )

Change subject: Merge branch 'master' into deployment
..


Merge branch 'master' into deployment

5d9f4b1f2 Remove void data from city field.
da4d82177 Strip double whitespace & html ampersands from first_name, last_name 
fields
bbe428265 CiviCRM submodule update

Change-Id: Ia3844df4e7ffa5190a279d3685cc09a1f1b99a7f
---
0 files changed, 0 insertions(+), 0 deletions(-)

Approvals:
  jenkins-bot: Verified
  Ejegg: Looks good to me, approved




-- 
To view, visit https://gerrit.wikimedia.org/r/376545
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia3844df4e7ffa5190a279d3685cc09a1f1b99a7f
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

[Ejegg (Code Review)]

Ejegg has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/376545 )

Change subject: Merge branch 'master' into deployment
..

Merge branch 'master' into deployment

5d9f4b1f2 Remove void data from city field.
da4d82177 Strip double whitespace & html ampersands from first_name, last_name 
fields
bbe428265 CiviCRM submodule update

Change-Id: Ia3844df4e7ffa5190a279d3685cc09a1f1b99a7f
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/45/376545/1


-- 
To view, visit https://gerrit.wikimedia.org/r/376545
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia3844df4e7ffa5190a279d3685cc09a1f1b99a7f
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/376090 )

Change subject: Merge branch 'master' into deployment
..


Merge branch 'master' into deployment

358fe989e FIXMEs regarding processor_id column
33f853566 Only count .json as message files
0ead428b6 Resolve ty batch start timestamp in PHP
51665eb2c Donation consumer: account for drush startup time
0a504f362 Thank you mailer: use process elapsed time to limit
98b3a0142 Require DI testing in phpunit bootstrap, update composer, fix 
currency rates
b8e438047 Actually cache fallback language templates
b5f5228ca Update pt-br and ja Thank You letters

Change-Id: Ic13204499c11f1a791ccad18d0147ed0ce270916
---
0 files changed, 0 insertions(+), 0 deletions(-)

Approvals:
  jenkins-bot: Verified
  Ejegg: Looks good to me, approved




-- 
To view, visit https://gerrit.wikimedia.org/r/376090
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic13204499c11f1a791ccad18d0147ed0ce270916
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

[Ejegg (Code Review)]

Ejegg has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/376090 )

Change subject: Merge branch 'master' into deployment
..

Merge branch 'master' into deployment

358fe989e FIXMEs regarding processor_id column
33f853566 Only count .json as message files
0ead428b6 Resolve ty batch start timestamp in PHP
51665eb2c Donation consumer: account for drush startup time
0a504f362 Thank you mailer: use process elapsed time to limit
98b3a0142 Require DI testing in phpunit bootstrap, update composer, fix 
currency rates
b8e438047 Actually cache fallback language templates
b5f5228ca Update pt-br and ja Thank You letters

Change-Id: Ic13204499c11f1a791ccad18d0147ed0ce270916
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/90/376090/1


-- 
To view, visit https://gerrit.wikimedia.org/r/376090
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic13204499c11f1a791ccad18d0147ed0ce270916
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/375009 )

Change subject: Merge branch 'master' into deployment
..


Merge branch 'master' into deployment

5a1cc7e3b Fix c_t.country population, add test
3004dc4a1 CiviMailStore: stop using deprecated Civi fn
5ffba11c3 Show watchdog messages on failed tests
533741349 Add unit tests for Thank You mailer
abe162fa9 TY mailer: skip extra queries to look up contact and custom fields

Change-Id: I9ef737046411105a99c171bee4c3efa2fa011975
---
D phpunit.xml
D sites/all/modules/offline2civicrm/tests/ChecksFileTest.php
D sites/all/modules/thank_you/tests/phpunit/ThankYouTest.php
D sites/all/modules/wmf_civicrm/tests/phpunit/HelperFunctionsTest.php
D sites/all/modules/wmf_common/tests/includes/BaseWmfDrupalPhpUnitTestCase.php
5 files changed, 0 insertions(+), 608 deletions(-)

Approvals:
  jenkins-bot: Verified
  Ejegg: Looks good to me, approved



diff --git a/phpunit.xml b/phpunit.xml
deleted file mode 100644
index 54f3166..000
--- a/phpunit.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<<< HEAD   (f00611 Merge branch 'master' into deployment)
-===
-http://www.w3.org/2001/XMLSchema-instance;
-xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/3.7/phpunit.xsd;
-bootstrap="sites/default/bootstrap-phpunit.php">
-
-
-
-  
-sites/all/modules/large_donation/tests
-  
-  
-sites/all/modules/offline2civicrm/tests
-
sites/all/modules/offline2civicrm/tests/includes/BaseChecksFileTest.php
-  
-  
-sites/all/modules/exchange_rates/tests/phpunit
-  
-  
-sites/all/modules/queue2civicrm/tests/phpunit
-  
-  
-sites/all/modules/recurring_globalcollect/tests
-  
-  
-sites/all/modules/thank_you/tests/phpunit
-  
-  
-sites/all/modules/wmf_audit/tests
-  
-  
-sites/all/modules/wmf_campaigns/tests
-  
-  
-sites/all/modules/wmf_civicrm/tests/phpunit
-  
-  
-sites/all/modules/wmf_common/tests/phpunit
-  
-  
-
sites/all/modules/wmf_communication/tests/phpunit
-
sites/all/modules/wmf_communication/tests/phpunit/CiviMailTestBase.php
-  
-  
-
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit
-  
-
-
->>> BRANCH (abe162 TY mailer: skip extra queries to look up contact and 
custom )
diff --git a/sites/all/modules/offline2civicrm/tests/ChecksFileTest.php 
b/sites/all/modules/offline2civicrm/tests/ChecksFileTest.php
deleted file mode 100644
index 1e6d974..000
--- a/sites/all/modules/offline2civicrm/tests/ChecksFileTest.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<<< HEAD   (f00611 Merge branch 'master' into deployment)
-===
- '',
-'' => '700',
-'' => '',
-);
-
-$importer = new ChecksFileProbe( "no URI" );
-$output = $importer->_parseRow( $data );
-}
-
-   /**
-* Populate contribution_tracking.country
-*/
-   function testImportCountry() {
-   // A few kinds of empty.
-   $data = array(
-   'Check Number' => mt_rand(),
-   'City' => 'blah city',
-   'Country' => 'AR',
-   'Email' => 'em...@phony.com',
-   'External Batch Number' => mt_rand(),
-   'First Name' => 'Test_first_name',
-   'Gift Source' => 'Community GIft',
-   'Last Name' => 'Test_last_name',
-   'Original Amount' => '123',
-   'Original Currency' => 'USD',
-   'Payment Instrument' => 'Trilogy',
-   'Postal Code' => '90210',
-   'Postmark Date' => '2012-02-02',
-   'Received Date' => '2017-07-07',
-   'State' => 'CA',
-   'Street Address' => '123 Sunset Boulevard',
-   'Transaction ID' => mt_rand(),
-   );
-
-   $importer = new ChecksFileProbe( "no URI" );
-   $message = $importer->_parseRow( $data );
-   $importer->doImport( $message );
-   $contribution = $this->callAPISuccessGetSingle(
-   'Contribution', array( 'trxn_id' => "GENERIC_IMPORT 
{$data['Transaction ID']}" )
-   );
-   $ct = db_select( 'contribution_tracking', 
'contribution_tracking' )
-   ->fields( 'contribution_tracking' )
-   ->condition( 'contribution_id', $contribution['id'] )
-   ->execute()
-   ->fetchAssoc();
-   $this->assertEquals( 'AR', $ct['country'] );
-   }
-}
->>> BRANCH (abe162 TY mailer: skip extra queries to look up contact and 
custom )
diff --git 

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

[Ejegg (Code Review)]

Ejegg has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/375009 )

Change subject: Merge branch 'master' into deployment
..

Merge branch 'master' into deployment

5a1cc7e3b Fix c_t.country population, add test
3004dc4a1 CiviMailStore: stop using deprecated Civi fn
5ffba11c3 Show watchdog messages on failed tests
533741349 Add unit tests for Thank You mailer
abe162fa9 TY mailer: skip extra queries to look up contact and custom fields

Change-Id: I9ef737046411105a99c171bee4c3efa2fa011975
---
D phpunit.xml
D sites/all/modules/offline2civicrm/tests/ChecksFileTest.php
D sites/all/modules/thank_you/tests/phpunit/ThankYouTest.php
D sites/all/modules/wmf_civicrm/tests/phpunit/HelperFunctionsTest.php
D sites/all/modules/wmf_common/tests/includes/BaseWmfDrupalPhpUnitTestCase.php
5 files changed, 0 insertions(+), 608 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/09/375009/1

diff --git a/phpunit.xml b/phpunit.xml
deleted file mode 100644
index 54f3166..000
--- a/phpunit.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<<< HEAD   (f00611 Merge branch 'master' into deployment)
-===
-http://www.w3.org/2001/XMLSchema-instance;
-xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/3.7/phpunit.xsd;
-bootstrap="sites/default/bootstrap-phpunit.php">
-
-
-
-  
-sites/all/modules/large_donation/tests
-  
-  
-sites/all/modules/offline2civicrm/tests
-
sites/all/modules/offline2civicrm/tests/includes/BaseChecksFileTest.php
-  
-  
-sites/all/modules/exchange_rates/tests/phpunit
-  
-  
-sites/all/modules/queue2civicrm/tests/phpunit
-  
-  
-sites/all/modules/recurring_globalcollect/tests
-  
-  
-sites/all/modules/thank_you/tests/phpunit
-  
-  
-sites/all/modules/wmf_audit/tests
-  
-  
-sites/all/modules/wmf_campaigns/tests
-  
-  
-sites/all/modules/wmf_civicrm/tests/phpunit
-  
-  
-sites/all/modules/wmf_common/tests/phpunit
-  
-  
-
sites/all/modules/wmf_communication/tests/phpunit
-
sites/all/modules/wmf_communication/tests/phpunit/CiviMailTestBase.php
-  
-  
-
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit
-  
-
-
->>> BRANCH (abe162 TY mailer: skip extra queries to look up contact and 
custom )
diff --git a/sites/all/modules/offline2civicrm/tests/ChecksFileTest.php 
b/sites/all/modules/offline2civicrm/tests/ChecksFileTest.php
deleted file mode 100644
index 1e6d974..000
--- a/sites/all/modules/offline2civicrm/tests/ChecksFileTest.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<<< HEAD   (f00611 Merge branch 'master' into deployment)
-===
- '',
-'' => '700',
-'' => '',
-);
-
-$importer = new ChecksFileProbe( "no URI" );
-$output = $importer->_parseRow( $data );
-}
-
-   /**
-* Populate contribution_tracking.country
-*/
-   function testImportCountry() {
-   // A few kinds of empty.
-   $data = array(
-   'Check Number' => mt_rand(),
-   'City' => 'blah city',
-   'Country' => 'AR',
-   'Email' => 'em...@phony.com',
-   'External Batch Number' => mt_rand(),
-   'First Name' => 'Test_first_name',
-   'Gift Source' => 'Community GIft',
-   'Last Name' => 'Test_last_name',
-   'Original Amount' => '123',
-   'Original Currency' => 'USD',
-   'Payment Instrument' => 'Trilogy',
-   'Postal Code' => '90210',
-   'Postmark Date' => '2012-02-02',
-   'Received Date' => '2017-07-07',
-   'State' => 'CA',
-   'Street Address' => '123 Sunset Boulevard',
-   'Transaction ID' => mt_rand(),
-   );
-
-   $importer = new ChecksFileProbe( "no URI" );
-   $message = $importer->_parseRow( $data );
-   $importer->doImport( $message );
-   $contribution = $this->callAPISuccessGetSingle(
-   'Contribution', array( 'trxn_id' => "GENERIC_IMPORT 
{$data['Transaction ID']}" )
-   );
-   $ct = db_select( 'contribution_tracking', 
'contribution_tracking' )
-   ->fields( 'contribution_tracking' )
-   ->condition( 'contribution_id', $contribution['id'] )
-   ->execute()
-   ->fetchAssoc();
-   $this->assertEquals( 'AR', $ct['country'] );
-   }
-}
->>> BRANCH (abe162 TY mailer: skip extra queries to look up contact and 
custom )

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/374562 )

Change subject: Merge branch 'master' into deployment
..


Merge branch 'master' into deployment

cee22c762 Add test for Templating
e9a491572 Cache result of template loads, including language fallback lookups

Change-Id: Ib3ceb63f2573c4e862cd99e73834e960d375cd4a
---
D sites/all/modules/wmf_communication/tests/phpunit/TemplatingTest.php
D sites/all/modules/wmf_communication/tests/templates/html/thank_you.it.html
2 files changed, 0 insertions(+), 66 deletions(-)

Approvals:
  jenkins-bot: Verified
  Ejegg: Looks good to me, approved



diff --git 
a/sites/all/modules/wmf_communication/tests/phpunit/TemplatingTest.php 
b/sites/all/modules/wmf_communication/tests/phpunit/TemplatingTest.php
deleted file mode 100644
index 8457858..000
--- a/sites/all/modules/wmf_communication/tests/phpunit/TemplatingTest.php
+++ /dev/null
@@ -1,56 +0,0 @@
- 'it',
-   'name' => 'Test Donor',
-   'receive_date' => 'Smarch 13th',
-   'currency' => 'EUR',
-   'amount' => 55.22
-   );
-   }
-
-   protected static $expected = "Caro Test Donor,
-
-Grazie per la tua donazione alla Wikimedia Foundation. È stata davvero 
apprezzata di
-cuore!
-
-Per le tue registrazioni: La tua donazione il Smarch 13th è stata
-€ 55,22.
-";
-
-   public function testRender() {
-   $params = $this->getParams();
-   $template = new Templating(
-   __DIR__ . DIRECTORY_SEPARATOR . '../templates',
-   'thank_you',
-   $params['locale'],
-   $params
-   );
-
-   $rendered = $template->render( 'html' );
-   $this->assertEquals( self::$expected, $rendered );
-   }
-
-   public function testRenderWithFallback() {
-   $params = $this->getParams();
-   $params['locale'] = 'it_FR';
-   $template = new Templating(
-   __DIR__ . DIRECTORY_SEPARATOR . '../templates',
-   'thank_you',
-   $params['locale'],
-   $params
-   );
-
-   $rendered = $template->render( 'html' );
-   $this->assertEquals( self::$expected, $rendered );
-   }
-}
diff --git 
a/sites/all/modules/wmf_communication/tests/templates/html/thank_you.it.html 
b/sites/all/modules/wmf_communication/tests/templates/html/thank_you.it.html
deleted file mode 100644
index 3de5bd7..000
--- a/sites/all/modules/wmf_communication/tests/templates/html/thank_you.it.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<<< HEAD   (7dfea0 Merge branch 'master' into deployment)
-===
-Caro {{name}},
-
-Grazie per la tua donazione alla Wikimedia Foundation. È stata davvero 
apprezzata di
-cuore!
-
-Per le tue registrazioni: La tua donazione il {{receive_date}} è stata
-{{ (currency ~ " " ~ amount) | l10n_currency(locale) }}.
->>> BRANCH (e9a491 Cache result of template loads, including language 
fallback )

-- 
To view, visit https://gerrit.wikimedia.org/r/374562
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib3ceb63f2573c4e862cd99e73834e960d375cd4a
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

[Ejegg (Code Review)]

Ejegg has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/374562 )

Change subject: Merge branch 'master' into deployment
..

Merge branch 'master' into deployment

cee22c762 Add test for Templating
e9a491572 Cache result of template loads, including language fallback lookups

Change-Id: Ib3ceb63f2573c4e862cd99e73834e960d375cd4a
---
D sites/all/modules/wmf_communication/tests/phpunit/TemplatingTest.php
D sites/all/modules/wmf_communication/tests/templates/html/thank_you.it.html
2 files changed, 0 insertions(+), 66 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/62/374562/1

diff --git 
a/sites/all/modules/wmf_communication/tests/phpunit/TemplatingTest.php 
b/sites/all/modules/wmf_communication/tests/phpunit/TemplatingTest.php
deleted file mode 100644
index 8457858..000
--- a/sites/all/modules/wmf_communication/tests/phpunit/TemplatingTest.php
+++ /dev/null
@@ -1,56 +0,0 @@
- 'it',
-   'name' => 'Test Donor',
-   'receive_date' => 'Smarch 13th',
-   'currency' => 'EUR',
-   'amount' => 55.22
-   );
-   }
-
-   protected static $expected = "Caro Test Donor,
-
-Grazie per la tua donazione alla Wikimedia Foundation. È stata davvero 
apprezzata di
-cuore!
-
-Per le tue registrazioni: La tua donazione il Smarch 13th è stata
-€ 55,22.
-";
-
-   public function testRender() {
-   $params = $this->getParams();
-   $template = new Templating(
-   __DIR__ . DIRECTORY_SEPARATOR . '../templates',
-   'thank_you',
-   $params['locale'],
-   $params
-   );
-
-   $rendered = $template->render( 'html' );
-   $this->assertEquals( self::$expected, $rendered );
-   }
-
-   public function testRenderWithFallback() {
-   $params = $this->getParams();
-   $params['locale'] = 'it_FR';
-   $template = new Templating(
-   __DIR__ . DIRECTORY_SEPARATOR . '../templates',
-   'thank_you',
-   $params['locale'],
-   $params
-   );
-
-   $rendered = $template->render( 'html' );
-   $this->assertEquals( self::$expected, $rendered );
-   }
-}
diff --git 
a/sites/all/modules/wmf_communication/tests/templates/html/thank_you.it.html 
b/sites/all/modules/wmf_communication/tests/templates/html/thank_you.it.html
deleted file mode 100644
index 3de5bd7..000
--- a/sites/all/modules/wmf_communication/tests/templates/html/thank_you.it.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<<< HEAD   (7dfea0 Merge branch 'master' into deployment)
-===
-Caro {{name}},
-
-Grazie per la tua donazione alla Wikimedia Foundation. È stata davvero 
apprezzata di
-cuore!
-
-Per le tue registrazioni: La tua donazione il {{receive_date}} è stata
-{{ (currency ~ " " ~ amount) | l10n_currency(locale) }}.
->>> BRANCH (e9a491 Cache result of template loads, including language 
fallback )

-- 
To view, visit https://gerrit.wikimedia.org/r/374562
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib3ceb63f2573c4e862cd99e73834e960d375cd4a
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/374392 )

Change subject: Merge branch 'master' into deployment
..


Merge branch 'master' into deployment

and update vendor

46e0a30d1 Deal with sparse refund records in WX files
e780dfe61 Ensure civicrm_initialize() called

Change-Id: I3acfdc2420e0a2914c1abeae2e15edecef95f8bc
---
D sites/all/modules/wmf_audit/tests/IngenicoAuditTest.php
D 
sites/all/modules/wmf_audit/tests/data/Ingenico/sparseRefund/wx1.00123420170828.010226.xml.gz
D sites/all/modules/wmf_common/tests/includes/BaseWmfDrupalPhpUnitTestCase.php
M vendor
4 files changed, 1 insertion(+), 420 deletions(-)

Approvals:
  jenkins-bot: Verified
  Ejegg: Looks good to me, approved



diff --git a/sites/all/modules/wmf_audit/tests/IngenicoAuditTest.php 
b/sites/all/modules/wmf_audit/tests/IngenicoAuditTest.php
deleted file mode 100644
index 4dfc78a..000
--- a/sites/all/modules/wmf_audit/tests/IngenicoAuditTest.php
+++ /dev/null
@@ -1,220 +0,0 @@
-<<< HEAD   (200f34 Merge branch 'master' into deployment)
-===
- __DIR__ . '/data/logs/',
-   'ingenico_audit_recon_completed_dir' => 
$this->getTempDir(),
-   'ingenico_audit_working_log_dir' => $this->getTempDir(),
-   );
-
-   foreach ( $dirs as $var => $dir ) {
-   if ( !is_dir( $dir ) ) {
-   mkdir( $dir );
-   }
-   variable_set( $var, $dir );
-   }
-
-   $old_working = glob( $dirs['ingenico_audit_working_log_dir'] . 
'*' );
-   foreach ( $old_working as $zap ) {
-   if ( is_file( $zap ) ) {
-   unlink( $zap );
-   }
-   }
-
-   variable_set( 'ingenico_audit_log_search_past_days', 7 );
-
-   // Fakedb doesn't fake the original txn for refunds, so add one 
here
-   $existing = wmf_civicrm_get_contributions_from_gateway_id( 
'globalcollect', '11992288' );
-   if ( $existing ) {
-   // Previous test run may have crashed before cleaning up
-   $contribution = $existing[0];
-   } else {
-   $msg = array(
-   'contribution_tracking_id' => 8675309,
-   'currency' => 'USD',
-   'date' => 1455825706,
-   'email' => 'n...@flying.com',
-   'gateway' => 'globalcollect',
-   'gateway_txn_id' => '11992288',
-   'gross' => 100.00,
-   'payment_method' => 'cc',
-   'payment_submethod' => 'visa',
-   );
-   $contribution = 
wmf_civicrm_contribution_message_import( $msg );
-   }
-   $this->contact_ids[] = $contribution['contact_id'];
-
-   // and another for the chargeback
-   $existing = wmf_civicrm_get_contributions_from_gateway_id( 
'globalcollect', '5552' );
-   if ( $existing ) {
-   // Previous test run may have crashed before cleaning up
-   $contribution = $existing[0];
-   } else {
-   $msg = array(
-   'contribution_tracking_id' => 5318008,
-   'currency' => 'USD',
-   'date' => 1443724034,
-   'email' => 'lovelys...@python.com',
-   'gateway' => 'globalcollect',
-   'gateway_txn_id' => '5552',
-   'gross' => 200.00,
-   'payment_method' => 'cc',
-   'payment_submethod' => 'visa',
-   );
-   $contribution = 
wmf_civicrm_contribution_message_import( $msg );
-   }
-   $this->contact_ids[] = $contribution['contact_id'];
-
-   // and another for the sparse refund
-   $this->setExchangeRates( 1443724034, array( 'EUR' => 1.5, 'USD' 
=> 1 ) );
-   $existing = wmf_civicrm_get_contributions_from_gateway_id( 
'globalcollect', '662235' );
-   if ( $existing ) {
-   // Previous test run may have crashed before cleaning up
-   $contribution = $existing[0];
-   } else {
-   db_merge( 'contribution_tracking' )->key( array(
-   'id' => 48987654
-   ) )->fields( array(
-   'country' => 'IT',
-   'utm_source' => 

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

[Ejegg (Code Review)]

Ejegg has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/374392 )

Change subject: Merge branch 'master' into deployment
..

Merge branch 'master' into deployment

and update vendor

46e0a30d1 Deal with sparse refund records in WX files
e780dfe61 Ensure civicrm_initialize() called

Change-Id: I3acfdc2420e0a2914c1abeae2e15edecef95f8bc
---
D sites/all/modules/wmf_audit/tests/IngenicoAuditTest.php
D 
sites/all/modules/wmf_audit/tests/data/Ingenico/sparseRefund/wx1.00123420170828.010226.xml.gz
D sites/all/modules/wmf_common/tests/includes/BaseWmfDrupalPhpUnitTestCase.php
M vendor
4 files changed, 1 insertion(+), 420 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/92/374392/1

diff --git a/sites/all/modules/wmf_audit/tests/IngenicoAuditTest.php 
b/sites/all/modules/wmf_audit/tests/IngenicoAuditTest.php
deleted file mode 100644
index 4dfc78a..000
--- a/sites/all/modules/wmf_audit/tests/IngenicoAuditTest.php
+++ /dev/null
@@ -1,220 +0,0 @@
-<<< HEAD   (200f34 Merge branch 'master' into deployment)
-===
- __DIR__ . '/data/logs/',
-   'ingenico_audit_recon_completed_dir' => 
$this->getTempDir(),
-   'ingenico_audit_working_log_dir' => $this->getTempDir(),
-   );
-
-   foreach ( $dirs as $var => $dir ) {
-   if ( !is_dir( $dir ) ) {
-   mkdir( $dir );
-   }
-   variable_set( $var, $dir );
-   }
-
-   $old_working = glob( $dirs['ingenico_audit_working_log_dir'] . 
'*' );
-   foreach ( $old_working as $zap ) {
-   if ( is_file( $zap ) ) {
-   unlink( $zap );
-   }
-   }
-
-   variable_set( 'ingenico_audit_log_search_past_days', 7 );
-
-   // Fakedb doesn't fake the original txn for refunds, so add one 
here
-   $existing = wmf_civicrm_get_contributions_from_gateway_id( 
'globalcollect', '11992288' );
-   if ( $existing ) {
-   // Previous test run may have crashed before cleaning up
-   $contribution = $existing[0];
-   } else {
-   $msg = array(
-   'contribution_tracking_id' => 8675309,
-   'currency' => 'USD',
-   'date' => 1455825706,
-   'email' => 'n...@flying.com',
-   'gateway' => 'globalcollect',
-   'gateway_txn_id' => '11992288',
-   'gross' => 100.00,
-   'payment_method' => 'cc',
-   'payment_submethod' => 'visa',
-   );
-   $contribution = 
wmf_civicrm_contribution_message_import( $msg );
-   }
-   $this->contact_ids[] = $contribution['contact_id'];
-
-   // and another for the chargeback
-   $existing = wmf_civicrm_get_contributions_from_gateway_id( 
'globalcollect', '5552' );
-   if ( $existing ) {
-   // Previous test run may have crashed before cleaning up
-   $contribution = $existing[0];
-   } else {
-   $msg = array(
-   'contribution_tracking_id' => 5318008,
-   'currency' => 'USD',
-   'date' => 1443724034,
-   'email' => 'lovelys...@python.com',
-   'gateway' => 'globalcollect',
-   'gateway_txn_id' => '5552',
-   'gross' => 200.00,
-   'payment_method' => 'cc',
-   'payment_submethod' => 'visa',
-   );
-   $contribution = 
wmf_civicrm_contribution_message_import( $msg );
-   }
-   $this->contact_ids[] = $contribution['contact_id'];
-
-   // and another for the sparse refund
-   $this->setExchangeRates( 1443724034, array( 'EUR' => 1.5, 'USD' 
=> 1 ) );
-   $existing = wmf_civicrm_get_contributions_from_gateway_id( 
'globalcollect', '662235' );
-   if ( $existing ) {
-   // Previous test run may have crashed before cleaning up
-   $contribution = $existing[0];
-   } else {
-   db_merge( 'contribution_tracking' )->key( array(
-   'id' => 48987654
-   ) )->fields( array(
-   'country' => 'IT',
-   

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/374346 )

Change subject: Merge branch 'master' into deployment
..


Merge branch 'master' into deployment

And update vendor

7c9e316e8 Update DonationInterface lib

Change-Id: I35b3da20874576aedda54c7ef3acf77572f01d21
---
M vendor
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  jenkins-bot: Verified
  Ejegg: Looks good to me, approved



diff --git a/vendor b/vendor
index 7f2c976..7b0c431 16
--- a/vendor
+++ b/vendor
@@ -1 +1 @@
-Subproject commit 7f2c9764f09b51ef4b67e64d2f983decdaa7ad24
+Subproject commit 7b0c431fb3e1f103aba63f4bdd3dce67d1c95bad

-- 
To view, visit https://gerrit.wikimedia.org/r/374346
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I35b3da20874576aedda54c7ef3acf77572f01d21
Gerrit-PatchSet: 2
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

[Ejegg (Code Review)]

Ejegg has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/374346 )

Change subject: Merge branch 'master' into deployment
..

Merge branch 'master' into deployment

7c9e316e8 Update DonationInterface lib

Change-Id: I35b3da20874576aedda54c7ef3acf77572f01d21
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/46/374346/1


-- 
To view, visit https://gerrit.wikimedia.org/r/374346
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I35b3da20874576aedda54c7ef3acf77572f01d21
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/373703 )

Change subject: Merge branch 'master' into deployment
..


Merge branch 'master' into deployment

103c9598c Update list of processors in Gateway Reconciliation report
38e11771d Thank you generator fixes
7b15776f0 TY generator: add another replacement pattern for $date
13b39802e Update ja and pt-br thank you letters

Change-Id: Ie0cde0bf42acb1aec854d21f5b7909f9465cb59f
---
0 files changed, 0 insertions(+), 0 deletions(-)

Approvals:
  jenkins-bot: Verified
  Ejegg: Looks good to me, approved




-- 
To view, visit https://gerrit.wikimedia.org/r/373703
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie0cde0bf42acb1aec854d21f5b7909f9465cb59f
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

[Ejegg (Code Review)]

Ejegg has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/373703 )

Change subject: Merge branch 'master' into deployment
..

Merge branch 'master' into deployment

103c9598c Update list of processors in Gateway Reconciliation report
38e11771d Thank you generator fixes
7b15776f0 TY generator: add another replacement pattern for $date
13b39802e Update ja and pt-br thank you letters

Change-Id: Ie0cde0bf42acb1aec854d21f5b7909f9465cb59f
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/03/373703/1


-- 
To view, visit https://gerrit.wikimedia.org/r/373703
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie0cde0bf42acb1aec854d21f5b7909f9465cb59f
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/373131 )

Change subject: Merge branch 'master' into deployment
..


Merge branch 'master' into deployment

And update vendor

9c67c29a2 Omnimail::omnigroupmember.get job: add slow download handling.
556ec49f5 CI: install CiviCRM with a fake sendmail
e66cf5f38 Update SmashPig library

Change-Id: Ie12fd395e24e6d6569aebee8d09d704e23935a8b
---
D sites/all/modules/wmf_audit/tests/IngenicoAuditTest.php
M vendor
2 files changed, 1 insertion(+), 175 deletions(-)

Approvals:
  jenkins-bot: Verified
  Ejegg: Looks good to me, approved



diff --git a/sites/all/modules/wmf_audit/tests/IngenicoAuditTest.php 
b/sites/all/modules/wmf_audit/tests/IngenicoAuditTest.php
deleted file mode 100644
index 2516fcc..000
--- a/sites/all/modules/wmf_audit/tests/IngenicoAuditTest.php
+++ /dev/null
@@ -1,174 +0,0 @@
-<<< HEAD   (4aa177 Merge branch 'master' into deployment)
-===
- __DIR__ . '/data/logs/',
-   'ingenico_audit_recon_completed_dir' => 
$this->getTempDir(),
-   'ingenico_audit_working_log_dir' => $this->getTempDir(),
-   );
-
-   foreach ( $dirs as $var => $dir ) {
-   if ( !is_dir( $dir ) ) {
-   mkdir( $dir );
-   }
-   variable_set( $var, $dir );
-   }
-
-   $old_working = glob( $dirs['ingenico_audit_working_log_dir'] . 
'*' );
-   foreach ( $old_working as $zap ) {
-   if ( is_file( $zap ) ) {
-   unlink( $zap );
-   }
-   }
-
-   variable_set( 'ingenico_audit_log_search_past_days', 7 );
-
-   // Fakedb doesn't fake the original txn for refunds, so add one 
here
-   $existing = wmf_civicrm_get_contributions_from_gateway_id( 
'globalcollect', '11992288' );
-   if ( $existing ) {
-   // Previous test run may have crashed before cleaning up
-   $contribution = $existing[0];
-   } else {
-   $msg = array(
-   'contribution_tracking_id' => 8675309,
-   'currency' => 'USD',
-   'date' => 1455825706,
-   'email' => 'n...@flying.com',
-   'gateway' => 'globalcollect',
-   'gateway_txn_id' => '11992288',
-   'gross' => 100.00,
-   'payment_method' => 'cc',
-   'payment_submethod' => 'visa',
-   );
-   $contribution = 
wmf_civicrm_contribution_message_import( $msg );
-   }
-   $this->contact_id = $contribution['contact_id'];
-
-   // and another for the chargeback
-   $existing = wmf_civicrm_get_contributions_from_gateway_id( 
'globalcollect', '5552' );
-   if ( $existing ) {
-   // Previous test run may have crashed before cleaning up
-   $contribution = $existing[0];
-   } else {
-   $msg = array(
-   'contribution_tracking_id' => 5318008,
-   'currency' => 'USD',
-   'date' => 1443724034,
-   'email' => 'lovelys...@python.com',
-   'gateway' => 'globalcollect',
-   'gateway_txn_id' => '5552',
-   'gross' => 200.00,
-   'payment_method' => 'cc',
-   'payment_submethod' => 'visa',
-   'contact_id' => $this->contact_id,
-   );
-   $contribution = 
wmf_civicrm_contribution_message_import( $msg );
-   }
-   }
-
-   public function tearDown() {
-   $this->cleanUpContact( $this->contact_id );
-   }
-
-   public function auditTestProvider() {
-   return array(
-   array( __DIR__ . '/data/Ingenico/donation/', array(
-   'main' => array(
-   array(
-   'contribution_tracking_id' => 
'5551212',
-   'country' => 'US',
-   'currency' => 'USD',
-   'date' => 1501368968,
-   'email' => 
'dutch...@flying.net',
-   'first_name' => 'Arthur',
-

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

[Ejegg (Code Review)]

Ejegg has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/373131 )

Change subject: Merge branch 'master' into deployment
..

Merge branch 'master' into deployment

9c67c29a2 Omnimail::omnigroupmember.get job: add slow download handling.
556ec49f5 CI: install CiviCRM with a fake sendmail
e66cf5f38 Update SmashPig library

Change-Id: Ie12fd395e24e6d6569aebee8d09d704e23935a8b
---
D sites/all/modules/wmf_audit/tests/IngenicoAuditTest.php
1 file changed, 0 insertions(+), 174 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/31/373131/1

diff --git a/sites/all/modules/wmf_audit/tests/IngenicoAuditTest.php 
b/sites/all/modules/wmf_audit/tests/IngenicoAuditTest.php
deleted file mode 100644
index 2516fcc..000
--- a/sites/all/modules/wmf_audit/tests/IngenicoAuditTest.php
+++ /dev/null
@@ -1,174 +0,0 @@
-<<< HEAD   (4aa177 Merge branch 'master' into deployment)
-===
- __DIR__ . '/data/logs/',
-   'ingenico_audit_recon_completed_dir' => 
$this->getTempDir(),
-   'ingenico_audit_working_log_dir' => $this->getTempDir(),
-   );
-
-   foreach ( $dirs as $var => $dir ) {
-   if ( !is_dir( $dir ) ) {
-   mkdir( $dir );
-   }
-   variable_set( $var, $dir );
-   }
-
-   $old_working = glob( $dirs['ingenico_audit_working_log_dir'] . 
'*' );
-   foreach ( $old_working as $zap ) {
-   if ( is_file( $zap ) ) {
-   unlink( $zap );
-   }
-   }
-
-   variable_set( 'ingenico_audit_log_search_past_days', 7 );
-
-   // Fakedb doesn't fake the original txn for refunds, so add one 
here
-   $existing = wmf_civicrm_get_contributions_from_gateway_id( 
'globalcollect', '11992288' );
-   if ( $existing ) {
-   // Previous test run may have crashed before cleaning up
-   $contribution = $existing[0];
-   } else {
-   $msg = array(
-   'contribution_tracking_id' => 8675309,
-   'currency' => 'USD',
-   'date' => 1455825706,
-   'email' => 'n...@flying.com',
-   'gateway' => 'globalcollect',
-   'gateway_txn_id' => '11992288',
-   'gross' => 100.00,
-   'payment_method' => 'cc',
-   'payment_submethod' => 'visa',
-   );
-   $contribution = 
wmf_civicrm_contribution_message_import( $msg );
-   }
-   $this->contact_id = $contribution['contact_id'];
-
-   // and another for the chargeback
-   $existing = wmf_civicrm_get_contributions_from_gateway_id( 
'globalcollect', '5552' );
-   if ( $existing ) {
-   // Previous test run may have crashed before cleaning up
-   $contribution = $existing[0];
-   } else {
-   $msg = array(
-   'contribution_tracking_id' => 5318008,
-   'currency' => 'USD',
-   'date' => 1443724034,
-   'email' => 'lovelys...@python.com',
-   'gateway' => 'globalcollect',
-   'gateway_txn_id' => '5552',
-   'gross' => 200.00,
-   'payment_method' => 'cc',
-   'payment_submethod' => 'visa',
-   'contact_id' => $this->contact_id,
-   );
-   $contribution = 
wmf_civicrm_contribution_message_import( $msg );
-   }
-   }
-
-   public function tearDown() {
-   $this->cleanUpContact( $this->contact_id );
-   }
-
-   public function auditTestProvider() {
-   return array(
-   array( __DIR__ . '/data/Ingenico/donation/', array(
-   'main' => array(
-   array(
-   'contribution_tracking_id' => 
'5551212',
-   'country' => 'US',
-   'currency' => 'USD',
-   'date' => 1501368968,
-   'email' => 
'dutch...@flying.net',
-   'first_name' => 'Arthur',
-  

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/371035 )

Change subject: Merge branch 'master' into deployment
..


Merge branch 'master' into deployment

cc6df81aa Initialize SmashPig context when submitting import

Change-Id: Ie5cce9e8b921387f5a2c6db38c138a1b5f30a680
---
0 files changed, 0 insertions(+), 0 deletions(-)

Approvals:
  jenkins-bot: Verified
  Ejegg: Looks good to me, approved




-- 
To view, visit https://gerrit.wikimedia.org/r/371035
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie5cce9e8b921387f5a2c6db38c138a1b5f30a680
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

[Ejegg (Code Review)]

Ejegg has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/371035 )

Change subject: Merge branch 'master' into deployment
..

Merge branch 'master' into deployment

cc6df81aa Initialize SmashPig context when submitting import

Change-Id: Ie5cce9e8b921387f5a2c6db38c138a1b5f30a680
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/35/371035/1


-- 
To view, visit https://gerrit.wikimedia.org/r/371035
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie5cce9e8b921387f5a2c6db38c138a1b5f30a680
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/370521 )

Change subject: Merge branch 'master' into deployment
..


Merge branch 'master' into deployment

130cb0bfd Set source fields correctly

Change-Id: Ie69c1c9469e4e8a8841d0cad4e5a0e8de9a0e2b9
---
0 files changed, 0 insertions(+), 0 deletions(-)

Approvals:
  jenkins-bot: Verified
  Ejegg: Looks good to me, approved




-- 
To view, visit https://gerrit.wikimedia.org/r/370521
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie69c1c9469e4e8a8841d0cad4e5a0e8de9a0e2b9
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

[Ejegg (Code Review)]

Ejegg has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/370521 )

Change subject: Merge branch 'master' into deployment
..

Merge branch 'master' into deployment

130cb0bfd Set source fields correctly

Change-Id: Ie69c1c9469e4e8a8841d0cad4e5a0e8de9a0e2b9
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/21/370521/1


-- 
To view, visit https://gerrit.wikimedia.org/r/370521
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie69c1c9469e4e8a8841d0cad4e5a0e8de9a0e2b9
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/370238 )

Change subject: Merge branch 'master' into deployment
..


Merge branch 'master' into deployment

bd3c0dab2 audit_echochar: handle more methods, don't crash

Change-Id: I1e075e376ed86145304a5c3899a1a01d6e6c18d2
---
0 files changed, 0 insertions(+), 0 deletions(-)

Approvals:
  jenkins-bot: Verified
  Ejegg: Looks good to me, approved




-- 
To view, visit https://gerrit.wikimedia.org/r/370238
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I1e075e376ed86145304a5c3899a1a01d6e6c18d2
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

[Ejegg (Code Review)]

Ejegg has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/370238 )

Change subject: Merge branch 'master' into deployment
..

Merge branch 'master' into deployment

bd3c0dab2 audit_echochar: handle more methods, don't crash

Change-Id: I1e075e376ed86145304a5c3899a1a01d6e6c18d2
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/38/370238/1


-- 
To view, visit https://gerrit.wikimedia.org/r/370238
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1e075e376ed86145304a5c3899a1a01d6e6c18d2
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/370093 )

Change subject: Merge branch 'master' into deployment
..


Merge branch 'master' into deployment

Delete tests and update vendor

a506f2ebb Restore unsubscribe tag replacement
caa411184 Add drush via composer.
7c046d929 Limit Silverpop group import to Opt In by default
1776e7f63 Update SmashPig, class name in Amazon audit
86a779d15 Ingenico WX audit module

Change-Id: Ia3ebdab05af46cc19e40640846142617d6bdb57f
---
D sites/all/modules/wmf_audit/tests/IngenicoAuditTest.php
D 
sites/all/modules/wmf_audit/tests/data/Ingenico/chargeback/wx1.00123420170801.010211.xml.gz
D 
sites/all/modules/wmf_audit/tests/data/Ingenico/donation/wx1.00123420170801.010211.xml.gz
D 
sites/all/modules/wmf_audit/tests/data/Ingenico/refund/wx1.00123420170801.010211.xml.gz
D sites/all/modules/wmf_audit/tests/data/logs/payments-globalcollect-20170730.gz
M vendor
6 files changed, 1 insertion(+), 169 deletions(-)

Approvals:
  jenkins-bot: Verified
  Ejegg: Looks good to me, approved



diff --git a/sites/all/modules/wmf_audit/tests/IngenicoAuditTest.php 
b/sites/all/modules/wmf_audit/tests/IngenicoAuditTest.php
deleted file mode 100644
index 1bdfa4a..000
--- a/sites/all/modules/wmf_audit/tests/IngenicoAuditTest.php
+++ /dev/null
@@ -1,168 +0,0 @@
- __DIR__ . '/data/logs/',
-   'ingenico_audit_recon_completed_dir' => 
$this->getTempDir(),
-   'ingenico_audit_working_log_dir' => $this->getTempDir(),
-   );
-
-   foreach ( $dirs as $var => $dir ) {
-   if ( !is_dir( $dir ) ) {
-   mkdir( $dir );
-   }
-   variable_set( $var, $dir );
-   }
-
-   $old_working = glob( $dirs['ingenico_audit_working_log_dir'] . 
'*' );
-   foreach ( $old_working as $zap ) {
-   if ( is_file( $zap ) ) {
-   unlink( $zap );
-   }
-   }
-
-   variable_set( 'ingenico_audit_log_search_past_days', 7 );
-
-   // Fakedb doesn't fake the original txn for refunds, so add one 
here
-   $existing = wmf_civicrm_get_contributions_from_gateway_id( 
'globalcollect', '11992288' );
-   if ( $existing ) {
-   // Previous test run may have crashed before cleaning up
-   $contribution = $existing[0];
-   } else {
-   $msg = array(
-   'contribution_tracking_id' => 8675309,
-   'currency' => 'USD',
-   'date' => 1455825706,
-   'email' => 'n...@flying.com',
-   'gateway' => 'globalcollect',
-   'gateway_txn_id' => '11992288',
-   'gross' => 100.00,
-   'payment_method' => 'cc',
-   'payment_submethod' => 'visa',
-   );
-   $contribution = 
wmf_civicrm_contribution_message_import( $msg );
-   }
-   $this->contact_id = $contribution['contact_id'];
-
-   // and another for the chargeback
-   $existing = wmf_civicrm_get_contributions_from_gateway_id( 
'globalcollect', '5552' );
-   if ( $existing ) {
-   // Previous test run may have crashed before cleaning up
-   $contribution = $existing[0];
-   } else {
-   $msg = array(
-   'contribution_tracking_id' => 5318008,
-   'currency' => 'USD',
-   'date' => 1443724034,
-   'email' => 'lovelys...@python.com',
-   'gateway' => 'globalcollect',
-   'gateway_txn_id' => '5552',
-   'gross' => 200.00,
-   'payment_method' => 'cc',
-   'payment_submethod' => 'visa',
-   'contact_id' => $this->contact_id,
-   );
-   $contribution = 
wmf_civicrm_contribution_message_import( $msg );
-   }
-   }
-
-   public function tearDown() {
-   $this->cleanUpContact( $this->contact_id );
-   }
-
-   public function auditTestProvider() {
-   return array(
-   array( __DIR__ . '/data/Ingenico/donation/', array(
-   'main' => array(
-   array(
-   'contribution_tracking_id' => 
'5551212',

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

[Ejegg (Code Review)]

Ejegg has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/370093 )

Change subject: Merge branch 'master' into deployment
..

Merge branch 'master' into deployment

Delete tests and update vendor

a506f2ebb Restore unsubscribe tag replacement
caa411184 Add drush via composer.
7c046d929 Limit Silverpop group import to Opt In by default
1776e7f63 Update SmashPig, class name in Amazon audit
86a779d15 Ingenico WX audit module

Change-Id: Ia3ebdab05af46cc19e40640846142617d6bdb57f
---
D sites/all/modules/wmf_audit/tests/IngenicoAuditTest.php
D 
sites/all/modules/wmf_audit/tests/data/Ingenico/chargeback/wx1.00123420170801.010211.xml.gz
D 
sites/all/modules/wmf_audit/tests/data/Ingenico/donation/wx1.00123420170801.010211.xml.gz
D 
sites/all/modules/wmf_audit/tests/data/Ingenico/refund/wx1.00123420170801.010211.xml.gz
D sites/all/modules/wmf_audit/tests/data/logs/payments-globalcollect-20170730.gz
M vendor
6 files changed, 1 insertion(+), 169 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/93/370093/1

diff --git a/sites/all/modules/wmf_audit/tests/IngenicoAuditTest.php 
b/sites/all/modules/wmf_audit/tests/IngenicoAuditTest.php
deleted file mode 100644
index 1bdfa4a..000
--- a/sites/all/modules/wmf_audit/tests/IngenicoAuditTest.php
+++ /dev/null
@@ -1,168 +0,0 @@
- __DIR__ . '/data/logs/',
-   'ingenico_audit_recon_completed_dir' => 
$this->getTempDir(),
-   'ingenico_audit_working_log_dir' => $this->getTempDir(),
-   );
-
-   foreach ( $dirs as $var => $dir ) {
-   if ( !is_dir( $dir ) ) {
-   mkdir( $dir );
-   }
-   variable_set( $var, $dir );
-   }
-
-   $old_working = glob( $dirs['ingenico_audit_working_log_dir'] . 
'*' );
-   foreach ( $old_working as $zap ) {
-   if ( is_file( $zap ) ) {
-   unlink( $zap );
-   }
-   }
-
-   variable_set( 'ingenico_audit_log_search_past_days', 7 );
-
-   // Fakedb doesn't fake the original txn for refunds, so add one 
here
-   $existing = wmf_civicrm_get_contributions_from_gateway_id( 
'globalcollect', '11992288' );
-   if ( $existing ) {
-   // Previous test run may have crashed before cleaning up
-   $contribution = $existing[0];
-   } else {
-   $msg = array(
-   'contribution_tracking_id' => 8675309,
-   'currency' => 'USD',
-   'date' => 1455825706,
-   'email' => 'n...@flying.com',
-   'gateway' => 'globalcollect',
-   'gateway_txn_id' => '11992288',
-   'gross' => 100.00,
-   'payment_method' => 'cc',
-   'payment_submethod' => 'visa',
-   );
-   $contribution = 
wmf_civicrm_contribution_message_import( $msg );
-   }
-   $this->contact_id = $contribution['contact_id'];
-
-   // and another for the chargeback
-   $existing = wmf_civicrm_get_contributions_from_gateway_id( 
'globalcollect', '5552' );
-   if ( $existing ) {
-   // Previous test run may have crashed before cleaning up
-   $contribution = $existing[0];
-   } else {
-   $msg = array(
-   'contribution_tracking_id' => 5318008,
-   'currency' => 'USD',
-   'date' => 1443724034,
-   'email' => 'lovelys...@python.com',
-   'gateway' => 'globalcollect',
-   'gateway_txn_id' => '5552',
-   'gross' => 200.00,
-   'payment_method' => 'cc',
-   'payment_submethod' => 'visa',
-   'contact_id' => $this->contact_id,
-   );
-   $contribution = 
wmf_civicrm_contribution_message_import( $msg );
-   }
-   }
-
-   public function tearDown() {
-   $this->cleanUpContact( $this->contact_id );
-   }
-
-   public function auditTestProvider() {
-   return array(
-   array( __DIR__ . '/data/Ingenico/donation/', array(
-   'main' => array(
-   array(
-   'contribution_tracking_id' => 

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/369415 )

Change subject: Merge branch 'master' into deployment
..


Merge branch 'master' into deployment

33a0ccaa2 Fix failing refund test
502351898 clean up insert_contribution_tracking signature
b713a2a5a Add country to c_t rows created during imports
8266a273c Make mailing get process skip on exception.
105027eb0 Omnimail MailingProviderData.get: extend specificity on id.

Change-Id: I552ac1b1e768706bccc38d659f18946a6ef6d61c
---
D sites/all/modules/recurring_globalcollect/tests/RecurringGlobalCollectTest.php
D sites/all/modules/wmf_civicrm/tests/phpunit/RefundTest.php
D sites/all/modules/wmf_common/tests/includes/BaseWmfDrupalPhpUnitTestCase.php
3 files changed, 0 insertions(+), 667 deletions(-)

Approvals:
  jenkins-bot: Verified
  Ejegg: Looks good to me, approved



diff --git 
a/sites/all/modules/recurring_globalcollect/tests/RecurringGlobalCollectTest.php
 
b/sites/all/modules/recurring_globalcollect/tests/RecurringGlobalCollectTest.php
deleted file mode 100644
index 1c50940..000
--- 
a/sites/all/modules/recurring_globalcollect/tests/RecurringGlobalCollectTest.php
+++ /dev/null
@@ -1,216 +0,0 @@
-<<< HEAD   (23f2bb Merge branch 'master' into deployment)
-===
-subscriptionId = 'SUB-FOO-' . mt_rand();
-   $this->amount = '1.12';
-
-   $this->contributions = array();
-
-   $result = civicrm_api3( 'Contact', 'create', array(
-   'first_name' => 'Testes',
-   'contact_type' => 'Individual',
-   ) );
-   $this->contactId = $result['id'];
-
-   $result = civicrm_api3( 'ContributionRecur', 'create', array(
-   'contact_id' => $this->contactId,
-   'amount' => $this->amount,
-   'frequency_interval' => 1,
-   'frequency_unit' => 'month',
-   'next_sched_contribution' => 
wmf_common_date_unix_to_civicrm(strtotime('+1 month')),
-   'installments' => 0,
-   'processor_id' => 1,
-   'currency' => 'USD',
-   'trxn_id' => "RECURRING GLOBALCOLLECT 
{$this->subscriptionId}",
-   ) );
-   $this->contributionRecurId = $result['id'];
-
-   $result = civicrm_api3( 'Contribution', 'create', array(
-   'contact_id' => $this->contactId,
-   'contribution_recur_id' => $this->contributionRecurId,
-   'currency' => 'USD',
-   'total_amount' => $this->amount,
-   'contribution_type' => 'Cash',
-   'payment_instrument' => 'Credit Card',
-   'trxn_id' => 'RECURRING GLOBALCOLLECT 
STUB_ORIG_CONTRIB-' . mt_rand(),
-   ) );
-   $this->contributions[] = $result['id'];
-   $tracking = array(
-   'utm_source' => '..rcc',
-   'utm_medium' => 'civicrm',
-   'ts' => wmf_common_date_unix_to_sql( strtotime( 'now' ) 
),
-   'contribution_id' => $result['id'],
-   );
-   wmf_civicrm_insert_contribution_tracking( $tracking );
-   }
-
-   function testChargeRecorded() {
-
-   // Get some extra access to the testing adapter :(
-   global $wgDonationInterfaceGatewayAdapters;
-   $wgDonationInterfaceGatewayAdapters['globalcollect'] = 
'TestingRecurringStubAdapter';
-
-   // Include using require_once rather than autoload because the 
file
-   // depends on a DonationInterface testing class we loaded above.
-   require_once __DIR__ . '/TestingRecurringStubAdapter.php';
-   TestingRecurringStubAdapter::$singletonDummyGatewayResponseCode 
= 'recurring-OK';
-
-   recurring_globalcollect_charge( $this->contributionRecurId );
-
-   $result = civicrm_api3( 'Contribution', 'get', array(
-   'contact_id' => $this->contactId,
-   ) );
-   $this->assertEquals( 2, count( $result['values'] ) );
-   foreach ( $result['values'] as $contribution ) {
-   if ( $contribution['id'] == $this->contributions[0] ) {
-   // Skip assertions on the synthetic original 
contribution
-   continue;
-   }
-
-   $this->assertEquals( 1,
-   preg_match( "/^RECURRING GLOBALCOLLECT 
{$this->subscriptionId}-2\$/", $contribution['trxn_id'] ) );
-   }
-   }
-
-   public function testRecurringCharge() {
-   $init = array(
-   'contribution_tracking_id' => 

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

[Ejegg (Code Review)]

Ejegg has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/369415 )

Change subject: Merge branch 'master' into deployment
..

Merge branch 'master' into deployment

33a0ccaa2 Fix failing refund test
502351898 clean up insert_contribution_tracking signature
b713a2a5a Add country to c_t rows created during imports
8266a273c Make mailing get process skip on exception.
105027eb0 Omnimail MailingProviderData.get: extend specificity on id.

Change-Id: I552ac1b1e768706bccc38d659f18946a6ef6d61c
---
D sites/all/modules/recurring_globalcollect/tests/RecurringGlobalCollectTest.php
D sites/all/modules/wmf_civicrm/tests/phpunit/RefundTest.php
D sites/all/modules/wmf_common/tests/includes/BaseWmfDrupalPhpUnitTestCase.php
3 files changed, 0 insertions(+), 667 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/15/369415/1

diff --git 
a/sites/all/modules/recurring_globalcollect/tests/RecurringGlobalCollectTest.php
 
b/sites/all/modules/recurring_globalcollect/tests/RecurringGlobalCollectTest.php
deleted file mode 100644
index 1c50940..000
--- 
a/sites/all/modules/recurring_globalcollect/tests/RecurringGlobalCollectTest.php
+++ /dev/null
@@ -1,216 +0,0 @@
-<<< HEAD   (23f2bb Merge branch 'master' into deployment)
-===
-subscriptionId = 'SUB-FOO-' . mt_rand();
-   $this->amount = '1.12';
-
-   $this->contributions = array();
-
-   $result = civicrm_api3( 'Contact', 'create', array(
-   'first_name' => 'Testes',
-   'contact_type' => 'Individual',
-   ) );
-   $this->contactId = $result['id'];
-
-   $result = civicrm_api3( 'ContributionRecur', 'create', array(
-   'contact_id' => $this->contactId,
-   'amount' => $this->amount,
-   'frequency_interval' => 1,
-   'frequency_unit' => 'month',
-   'next_sched_contribution' => 
wmf_common_date_unix_to_civicrm(strtotime('+1 month')),
-   'installments' => 0,
-   'processor_id' => 1,
-   'currency' => 'USD',
-   'trxn_id' => "RECURRING GLOBALCOLLECT 
{$this->subscriptionId}",
-   ) );
-   $this->contributionRecurId = $result['id'];
-
-   $result = civicrm_api3( 'Contribution', 'create', array(
-   'contact_id' => $this->contactId,
-   'contribution_recur_id' => $this->contributionRecurId,
-   'currency' => 'USD',
-   'total_amount' => $this->amount,
-   'contribution_type' => 'Cash',
-   'payment_instrument' => 'Credit Card',
-   'trxn_id' => 'RECURRING GLOBALCOLLECT 
STUB_ORIG_CONTRIB-' . mt_rand(),
-   ) );
-   $this->contributions[] = $result['id'];
-   $tracking = array(
-   'utm_source' => '..rcc',
-   'utm_medium' => 'civicrm',
-   'ts' => wmf_common_date_unix_to_sql( strtotime( 'now' ) 
),
-   'contribution_id' => $result['id'],
-   );
-   wmf_civicrm_insert_contribution_tracking( $tracking );
-   }
-
-   function testChargeRecorded() {
-
-   // Get some extra access to the testing adapter :(
-   global $wgDonationInterfaceGatewayAdapters;
-   $wgDonationInterfaceGatewayAdapters['globalcollect'] = 
'TestingRecurringStubAdapter';
-
-   // Include using require_once rather than autoload because the 
file
-   // depends on a DonationInterface testing class we loaded above.
-   require_once __DIR__ . '/TestingRecurringStubAdapter.php';
-   TestingRecurringStubAdapter::$singletonDummyGatewayResponseCode 
= 'recurring-OK';
-
-   recurring_globalcollect_charge( $this->contributionRecurId );
-
-   $result = civicrm_api3( 'Contribution', 'get', array(
-   'contact_id' => $this->contactId,
-   ) );
-   $this->assertEquals( 2, count( $result['values'] ) );
-   foreach ( $result['values'] as $contribution ) {
-   if ( $contribution['id'] == $this->contributions[0] ) {
-   // Skip assertions on the synthetic original 
contribution
-   continue;
-   }
-
-   $this->assertEquals( 1,
-   preg_match( "/^RECURRING GLOBALCOLLECT 
{$this->subscriptionId}-2\$/", $contribution['trxn_id'] ) );
-   }
-   }
-
-   public function testRecurringCharge() {
-   $init = array(
-   

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/368311 )

Change subject: Merge branch 'master' into deployment
..


Merge branch 'master' into deployment

7907ec4e9 Add throttling to Omnrecipients.load function
1af6a49f7 Simplify duplicate check call

Change-Id: Iacd4daad1de242ab5e414356a54286d70fbaddd1
---
0 files changed, 0 insertions(+), 0 deletions(-)

Approvals:
  jenkins-bot: Verified
  Ejegg: Looks good to me, approved




-- 
To view, visit https://gerrit.wikimedia.org/r/368311
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Iacd4daad1de242ab5e414356a54286d70fbaddd1
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

[Ejegg (Code Review)]

Ejegg has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/368311 )

Change subject: Merge branch 'master' into deployment
..

Merge branch 'master' into deployment

7907ec4e9 Add throttling to Omnrecipients.load function
1af6a49f7 Simplify duplicate check call

Change-Id: Iacd4daad1de242ab5e414356a54286d70fbaddd1
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/11/368311/1


-- 
To view, visit https://gerrit.wikimedia.org/r/368311
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iacd4daad1de242ab5e414356a54286d70fbaddd1
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/368195 )

Change subject: Merge branch 'master' into deployment
..


Merge branch 'master' into deployment

7d0c7b55e Fix duplicate check logic
03cd8c507 Initialize SmashPig context for recurring Ingenico charges

Change-Id: I483a020b6bf91e4921c6c0b34ef8561c7cee1b2b
---
0 files changed, 0 insertions(+), 0 deletions(-)

Approvals:
  jenkins-bot: Verified
  Ejegg: Looks good to me, approved




-- 
To view, visit https://gerrit.wikimedia.org/r/368195
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I483a020b6bf91e4921c6c0b34ef8561c7cee1b2b
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

[Ejegg (Code Review)]

Ejegg has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/368195 )

Change subject: Merge branch 'master' into deployment
..

Merge branch 'master' into deployment

7d0c7b55e Fix duplicate check logic
03cd8c507 Initialize SmashPig context for recurring Ingenico charges

Change-Id: I483a020b6bf91e4921c6c0b34ef8561c7cee1b2b
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/95/368195/1


-- 
To view, visit https://gerrit.wikimedia.org/r/368195
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I483a020b6bf91e4921c6c0b34ef8561c7cee1b2b
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/368105 )

Change subject: Merge branch 'master' into deployment
..


Merge branch 'master' into deployment

6cf08f690 Fixes for SmashPig update
d502f4ee3 Make CI scripts more stricts
0c855ebb2 Fix misc bash oddities in the CI scripts

Change-Id: I9b6ab8b32d1f4b04cb7634378ddbe0241556d37c
---
0 files changed, 0 insertions(+), 0 deletions(-)

Approvals:
  jenkins-bot: Verified
  Ejegg: Looks good to me, approved




-- 
To view, visit https://gerrit.wikimedia.org/r/368105
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I9b6ab8b32d1f4b04cb7634378ddbe0241556d37c
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

[Ejegg (Code Review)]

Ejegg has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/368105 )

Change subject: Merge branch 'master' into deployment
..

Merge branch 'master' into deployment

6cf08f690 Fixes for SmashPig update
d502f4ee3 Make CI scripts more stricts
0c855ebb2 Fix misc bash oddities in the CI scripts

Change-Id: I9b6ab8b32d1f4b04cb7634378ddbe0241556d37c
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/05/368105/1


-- 
To view, visit https://gerrit.wikimedia.org/r/368105
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9b6ab8b32d1f4b04cb7634378ddbe0241556d37c
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/367944 )

Change subject: Merge branch 'master' into deployment
..


Merge branch 'master' into deployment

And update vendor submodule

8c89e7bf9 Add tests & finalise unsubscribe process
edefb82ab Update SmashPig and DonationInterface
a2bf76aa4 Fix typo causing enotice & suppressed not to populate

Change-Id: I3190ba4a900e178865a2c443a6f64a7ef2c852ec
---
D sites/all/modules/queue2civicrm/tests/phpunit/AntifraudQueueTest.php
D sites/all/modules/queue2civicrm/tests/phpunit/BannerHistoryTest.php
D sites/all/modules/queue2civicrm/tests/phpunit/DonationQueueTest.php
D sites/all/modules/queue2civicrm/tests/phpunit/PaymentsInitQueueTest.php
D sites/all/modules/queue2civicrm/tests/phpunit/RecurringQueueTest.php
D sites/all/modules/queue2civicrm/tests/phpunit/RefundQueueTest.php
D sites/all/modules/recurring_globalcollect/tests/RecurringGlobalCollectTest.php
D sites/all/modules/wmf_audit/tests/AmazonAuditTest.php
D sites/all/modules/wmf_civicrm/tests/phpunit/DonationInterfaceFactoryTest.php
D sites/all/modules/wmf_common/tests/includes/BaseWmfDrupalPhpUnitTestCase.php
M vendor
11 files changed, 1 insertion(+), 1,590 deletions(-)

Approvals:
  jenkins-bot: Verified
  Ejegg: Looks good to me, approved



diff --git 
a/sites/all/modules/queue2civicrm/tests/phpunit/AntifraudQueueTest.php 
b/sites/all/modules/queue2civicrm/tests/phpunit/AntifraudQueueTest.php
deleted file mode 100644
index d376c2f..000
--- a/sites/all/modules/queue2civicrm/tests/phpunit/AntifraudQueueTest.php
+++ /dev/null
@@ -1,129 +0,0 @@
-<<< HEAD   (461900 Merge "Merge branch 'master' of 
https://gerrit.wikimedia.org)
-===
-consumer = new AntifraudQueueConsumer(
-   'payments-antifraud'
-   );
-   }
-
-   public function testValidMessage() {
-   $message = json_decode(
-   file_get_contents( __DIR__ . 
'/../data/payments-antifraud.json'),
-   true
-   );
-   $ctId = mt_rand();
-   $oId = $ctId . '.0';
-   $message['contribution_tracking_id'] = $ctId;
-   $message['order_id'] = $oId;
-   $this->consumer->processMessage( $message );
-
-   $this->compareMessageWithDb( $message, 
$message['score_breakdown'] );
-   }
-
-   /**
-* The first message for a ct_id / order_id pair needs to be complete
-*
-* @expectedException FredgeDataValidationException
-*/
-   public function testIncompleteMessage() {
-   $message = json_decode(
-   file_get_contents( __DIR__ . 
'/../data/payments-antifraud.json'),
-   true
-   );
-   unset( $message['user_ip'] );
-   $this->consumer->processMessage( $message );
-   }
-
-   public function testCombinedMessage() {
-   $message1 = json_decode(
-   file_get_contents( __DIR__ . 
'/../data/payments-antifraud.json'),
-   true
-   );
-   $message2 = json_decode(
-   file_get_contents( __DIR__ . 
'/../data/payments-antifraud.json'),
-   true
-   );
-   $ctId = mt_rand();
-   $oId = $ctId . '.0';
-   $message1['contribution_tracking_id'] = $ctId;
-   $message2['contribution_tracking_id'] = $ctId;
-   $message1['order_id'] = $oId;
-   $message2['order_id'] = $oId;
-   $message1['score_breakdown'] = array_slice(
-   $message1['score_breakdown'], 0, 4
-   );
-   $message2['score_breakdown'] = array_slice(
-   $message2['score_breakdown'], 4, 4
-   );
-   $this->consumer->processMessage( $message1 );
-
-   $dbEntries = $this->getDbEntries( $ctId, $oId );
-   $this->assertEquals( 4, count( $dbEntries ) );
-
-   $this->consumer->processMessage( $message2 );
-
-   $breakdown = array_merge(
-   $message1['score_breakdown'], 
$message2['score_breakdown']
-   );
-
-   $this->compareMessageWithDb( $message1, $breakdown );
-   }
-
-   protected function compareMessageWithDb( $common, $breakdown ) {
-   $dbEntries = $this->getDbEntries(
-   $common['contribution_tracking_id'], $common['order_id']
-   );
-   $this->assertEquals( 8, count( $dbEntries ) );
-   $fields = array(
-   'gateway',  'validation_action', 'payment_method',
-   'risk_score', 'server'
-   );
-   foreach ( $fields as $field ) {
-   $this->assertEquals( 

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

[Ejegg (Code Review)]

Ejegg has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/367944 )

Change subject: Merge branch 'master' into deployment
..

Merge branch 'master' into deployment

And update vendor submodule

8c89e7bf9 Add tests & finalise unsubscribe process
edefb82ab Update SmashPig and DonationInterface
a2bf76aa4 Fix typo causing enotice & suppressed not to populate

Change-Id: I3190ba4a900e178865a2c443a6f64a7ef2c852ec
---
D sites/all/modules/queue2civicrm/tests/phpunit/AntifraudQueueTest.php
D sites/all/modules/queue2civicrm/tests/phpunit/BannerHistoryTest.php
D sites/all/modules/queue2civicrm/tests/phpunit/DonationQueueTest.php
D sites/all/modules/queue2civicrm/tests/phpunit/PaymentsInitQueueTest.php
D sites/all/modules/queue2civicrm/tests/phpunit/RecurringQueueTest.php
D sites/all/modules/queue2civicrm/tests/phpunit/RefundQueueTest.php
D sites/all/modules/recurring_globalcollect/tests/RecurringGlobalCollectTest.php
D sites/all/modules/wmf_audit/tests/AmazonAuditTest.php
D sites/all/modules/wmf_civicrm/tests/phpunit/DonationInterfaceFactoryTest.php
D sites/all/modules/wmf_common/tests/includes/BaseWmfDrupalPhpUnitTestCase.php
M vendor
11 files changed, 1 insertion(+), 1,590 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/44/367944/1

diff --git 
a/sites/all/modules/queue2civicrm/tests/phpunit/AntifraudQueueTest.php 
b/sites/all/modules/queue2civicrm/tests/phpunit/AntifraudQueueTest.php
deleted file mode 100644
index d376c2f..000
--- a/sites/all/modules/queue2civicrm/tests/phpunit/AntifraudQueueTest.php
+++ /dev/null
@@ -1,129 +0,0 @@
-<<< HEAD   (461900 Merge "Merge branch 'master' of 
https://gerrit.wikimedia.org)
-===
-consumer = new AntifraudQueueConsumer(
-   'payments-antifraud'
-   );
-   }
-
-   public function testValidMessage() {
-   $message = json_decode(
-   file_get_contents( __DIR__ . 
'/../data/payments-antifraud.json'),
-   true
-   );
-   $ctId = mt_rand();
-   $oId = $ctId . '.0';
-   $message['contribution_tracking_id'] = $ctId;
-   $message['order_id'] = $oId;
-   $this->consumer->processMessage( $message );
-
-   $this->compareMessageWithDb( $message, 
$message['score_breakdown'] );
-   }
-
-   /**
-* The first message for a ct_id / order_id pair needs to be complete
-*
-* @expectedException FredgeDataValidationException
-*/
-   public function testIncompleteMessage() {
-   $message = json_decode(
-   file_get_contents( __DIR__ . 
'/../data/payments-antifraud.json'),
-   true
-   );
-   unset( $message['user_ip'] );
-   $this->consumer->processMessage( $message );
-   }
-
-   public function testCombinedMessage() {
-   $message1 = json_decode(
-   file_get_contents( __DIR__ . 
'/../data/payments-antifraud.json'),
-   true
-   );
-   $message2 = json_decode(
-   file_get_contents( __DIR__ . 
'/../data/payments-antifraud.json'),
-   true
-   );
-   $ctId = mt_rand();
-   $oId = $ctId . '.0';
-   $message1['contribution_tracking_id'] = $ctId;
-   $message2['contribution_tracking_id'] = $ctId;
-   $message1['order_id'] = $oId;
-   $message2['order_id'] = $oId;
-   $message1['score_breakdown'] = array_slice(
-   $message1['score_breakdown'], 0, 4
-   );
-   $message2['score_breakdown'] = array_slice(
-   $message2['score_breakdown'], 4, 4
-   );
-   $this->consumer->processMessage( $message1 );
-
-   $dbEntries = $this->getDbEntries( $ctId, $oId );
-   $this->assertEquals( 4, count( $dbEntries ) );
-
-   $this->consumer->processMessage( $message2 );
-
-   $breakdown = array_merge(
-   $message1['score_breakdown'], 
$message2['score_breakdown']
-   );
-
-   $this->compareMessageWithDb( $message1, $breakdown );
-   }
-
-   protected function compareMessageWithDb( $common, $breakdown ) {
-   $dbEntries = $this->getDbEntries(
-   $common['contribution_tracking_id'], $common['order_id']
-   );
-   $this->assertEquals( 8, count( $dbEntries ) );
-   $fields = array(
-   'gateway',  'validation_action', 'payment_method',
-   'risk_score', 'server'
-   );
-   foreach ( $fields as $field ) {
-   

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/364913 )

Change subject: Merge branch 'master' into deployment
..


Merge branch 'master' into deployment

And update CiviCRM pointer to get primary address import

542da931c Fix thank you mailer watchdog message
b0f16c817 Speed up thank you query

Change-Id: Icf9d4a7ce26659fbf5a8f3401371d242f8b899ea
---
M civicrm
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  jenkins-bot: Verified
  Ejegg: Looks good to me, approved



diff --git a/civicrm b/civicrm
index 7ff5e80..1620e86 16
--- a/civicrm
+++ b/civicrm
@@ -1 +1 @@
-Subproject commit 7ff5e80169a112bd5b68004ff255b1cf326ebdc2
+Subproject commit 1620e8653ff8244930c8cc5a36eba8f51033bc5a

-- 
To view, visit https://gerrit.wikimedia.org/r/364913
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Icf9d4a7ce26659fbf5a8f3401371d242f8b899ea
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

[Ejegg (Code Review)]

Ejegg has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/364913 )

Change subject: Merge branch 'master' into deployment
..

Merge branch 'master' into deployment

And update CiviCRM pointer to get primary address import

542da931c Fix thank you mailer watchdog message
b0f16c817 Speed up thank you query

Change-Id: Icf9d4a7ce26659fbf5a8f3401371d242f8b899ea
---
M civicrm
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/13/364913/1

diff --git a/civicrm b/civicrm
index 7ff5e80..1620e86 16
--- a/civicrm
+++ b/civicrm
@@ -1 +1 @@
-Subproject commit 7ff5e80169a112bd5b68004ff255b1cf326ebdc2
+Subproject commit 1620e8653ff8244930c8cc5a36eba8f51033bc5a

-- 
To view, visit https://gerrit.wikimedia.org/r/364913
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Icf9d4a7ce26659fbf5a8f3401371d242f8b899ea
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/363659 )

Change subject: Merge branch 'master' into deployment
..


Merge branch 'master' into deployment

f8f590e Merge civicrm updates into master

Change-Id: Iedfa3878166fbd6f1e02f301d2dea6013d990121
---
0 files changed, 0 insertions(+), 0 deletions(-)

Approvals:
  Mepps: Looks good to me, approved
  jenkins-bot: Verified




-- 
To view, visit https://gerrit.wikimedia.org/r/363659
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Iedfa3878166fbd6f1e02f301d2dea6013d990121
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Mepps 
Gerrit-Reviewer: Mepps 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

[Mepps (Code Review)]

Mepps has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/363659 )

Change subject: Merge branch 'master' into deployment
..

Merge branch 'master' into deployment

f8f590e Merge civicrm updates into master

Change-Id: Iedfa3878166fbd6f1e02f301d2dea6013d990121
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/59/363659/1


-- 
To view, visit https://gerrit.wikimedia.org/r/363659
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iedfa3878166fbd6f1e02f301d2dea6013d990121
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Mepps 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/359976 )

Change subject: Merge branch 'master' into deployment
..


Merge branch 'master' into deployment

3c3c5cc Save contribution if duplicate invoice id

Change-Id: I495a551e9dd945133bb94aec6e99fa96c3f783aa
---
D sites/all/modules/wmf_civicrm/tests/includes/CiviFixtures.php
D sites/all/modules/wmf_civicrm/tests/phpunit/ImportMessageTest.php
2 files changed, 0 insertions(+), 700 deletions(-)

Approvals:
  Mepps: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/sites/all/modules/wmf_civicrm/tests/includes/CiviFixtures.php 
b/sites/all/modules/wmf_civicrm/tests/includes/CiviFixtures.php
deleted file mode 100644
index 481cfe8..000
--- a/sites/all/modules/wmf_civicrm/tests/includes/CiviFixtures.php
+++ /dev/null
@@ -1,110 +0,0 @@
-<<< HEAD   (dfc26f Merge branch 'master' into deployment)
-===
- 'Individual',
-  'first_name' => 'Test',
-  'last_name' => 'Es'
-));
-$out->contact_id = $individual['id'];
-
-$out->org_contact_name = 'Test DAF ' . mt_rand();
-
-$organization = civicrm_api3('Contact', 'Create', array(
-  'contact_type' => 'Organization',
-  'organization_name' => $out->org_contact_name,
-));
-$out->org_contact_id = $organization['id'];
-
-$out->recur_amount = '2.34';
-$out->subscription_id = 'SUB-' . mt_rand();
-$out->epoch_time = time();
-$out->sql_time = wmf_common_date_unix_to_sql( $out->epoch_time );
-
-$subscription_params = array(
-'contact_id' => $out->contact_id,
-'amount' => $out->recur_amount,
-'currency' => 'USD',
-'frequency_unit' => 'month',
-'frequency_interval' => '1',
-'installments' => '0',
-'start_date' => wmf_common_date_unix_to_civicrm( $out->epoch_time 
),
-'create_date' => wmf_common_date_unix_to_civicrm( $out->epoch_time 
),
-'cancel_date' => null,
-'processor_id' => 1,
-'cycle_day' => '1',
-'next_sched_contribution' => null,
-'trxn_id' => "RECURRING TEST_GATEWAY {$out->subscription_id}-1 
{$out->epoch_time}",
-
-'version' => 3,
-);
-$contributionRecur = civicrm_api3('ContributionRecur', 'Create', 
$subscription_params);
-$out->contribution_recur_id = $contributionRecur['id'];
-
-$out->contact_group_name = 'test_thrilled_demographic';
-$group = civicrm_api3('Group', 'get', array('title' => 
$out->contact_group_name));
-
-if ($group['count'] === 1 ) {
-$out->contact_group_id = $group['id'];
-} else {
-$group = civicrm_api3('Group', 'create', array(
-  'title' => $out->contact_group_name,
-  'name' => $out->contact_group_name,
-));
-$out->contact_group_id = $group['id'];
-}
-
-$out->contribution_amount = '1.00';
-
-$contribution_params = array(
-'contact_id' => $out->contact_id,
-'amount' => $out->contribution_amount,
-'total_amount' => $out->contribution_amount,
-'create_date' => wmf_common_date_unix_to_civicrm( $out->epoch_time 
),
-'financial_type_id' => 1,
-'invoice_id' => mt_rand(),
-);
-$contribution = civicrm_api3('Contribution', 'Create', 
$contribution_params);
-$id = $contribution['id'];
-$contribution_values = $contribution['values'][$id];
-$out->contribution_invoice_id = $contribution_values['invoice_id'];
-
-return $out;
-}
-
-  /**
-   * Tear down function.
-   */
-public function __destruct() {
-civicrm_api3('ContributionRecur', 'delete', array('id' => 
$this->contribution_recur_id));
-civicrm_api3('Contact', 'delete', array('id' => $this->contact_id));
-}
-}
->>> BRANCH (3c3c5c Save contribution if duplicate invoice id)
diff --git a/sites/all/modules/wmf_civicrm/tests/phpunit/ImportMessageTest.php 
b/sites/all/modules/wmf_civicrm/tests/phpunit/ImportMessageTest.php
deleted file mode 100644
index 36c6166..000
--- a/sites/all/modules/wmf_civicrm/tests/phpunit/ImportMessageTest.php
+++ /dev/null
@@ -1,590 +0,0 @@
-<<< HEAD   (dfc26f Merge branch 'master' into deployment)
-===
- WMF_CAMPAIGNS_OPTION_GROUP_NAME,
-'label' => ImportMessageTest_campaign,
-'value' => ImportMessageTest_campaign,
-) );
-}
-
-public function tearDown() {
-if ( $this->contribution_id ) {
-  $this->callAPISuccess('Contribution', 'delete', array('id' => 
$this->contribution_id));
-}
-parent::tearDown();
-}
-
-/**
- * @dataProvider messageProvider
- */
-public function testMessageInsert( $msg, $expected ) {
-

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

[Mepps (Code Review)]

Mepps has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/359976 )

Change subject: Merge branch 'master' into deployment
..

Merge branch 'master' into deployment

Change-Id: I495a551e9dd945133bb94aec6e99fa96c3f783aa
---
D sites/all/modules/wmf_civicrm/tests/includes/CiviFixtures.php
D sites/all/modules/wmf_civicrm/tests/phpunit/ImportMessageTest.php
2 files changed, 0 insertions(+), 700 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/76/359976/1

diff --git a/sites/all/modules/wmf_civicrm/tests/includes/CiviFixtures.php 
b/sites/all/modules/wmf_civicrm/tests/includes/CiviFixtures.php
deleted file mode 100644
index 481cfe8..000
--- a/sites/all/modules/wmf_civicrm/tests/includes/CiviFixtures.php
+++ /dev/null
@@ -1,110 +0,0 @@
-<<< HEAD   (dfc26f Merge branch 'master' into deployment)
-===
- 'Individual',
-  'first_name' => 'Test',
-  'last_name' => 'Es'
-));
-$out->contact_id = $individual['id'];
-
-$out->org_contact_name = 'Test DAF ' . mt_rand();
-
-$organization = civicrm_api3('Contact', 'Create', array(
-  'contact_type' => 'Organization',
-  'organization_name' => $out->org_contact_name,
-));
-$out->org_contact_id = $organization['id'];
-
-$out->recur_amount = '2.34';
-$out->subscription_id = 'SUB-' . mt_rand();
-$out->epoch_time = time();
-$out->sql_time = wmf_common_date_unix_to_sql( $out->epoch_time );
-
-$subscription_params = array(
-'contact_id' => $out->contact_id,
-'amount' => $out->recur_amount,
-'currency' => 'USD',
-'frequency_unit' => 'month',
-'frequency_interval' => '1',
-'installments' => '0',
-'start_date' => wmf_common_date_unix_to_civicrm( $out->epoch_time 
),
-'create_date' => wmf_common_date_unix_to_civicrm( $out->epoch_time 
),
-'cancel_date' => null,
-'processor_id' => 1,
-'cycle_day' => '1',
-'next_sched_contribution' => null,
-'trxn_id' => "RECURRING TEST_GATEWAY {$out->subscription_id}-1 
{$out->epoch_time}",
-
-'version' => 3,
-);
-$contributionRecur = civicrm_api3('ContributionRecur', 'Create', 
$subscription_params);
-$out->contribution_recur_id = $contributionRecur['id'];
-
-$out->contact_group_name = 'test_thrilled_demographic';
-$group = civicrm_api3('Group', 'get', array('title' => 
$out->contact_group_name));
-
-if ($group['count'] === 1 ) {
-$out->contact_group_id = $group['id'];
-} else {
-$group = civicrm_api3('Group', 'create', array(
-  'title' => $out->contact_group_name,
-  'name' => $out->contact_group_name,
-));
-$out->contact_group_id = $group['id'];
-}
-
-$out->contribution_amount = '1.00';
-
-$contribution_params = array(
-'contact_id' => $out->contact_id,
-'amount' => $out->contribution_amount,
-'total_amount' => $out->contribution_amount,
-'create_date' => wmf_common_date_unix_to_civicrm( $out->epoch_time 
),
-'financial_type_id' => 1,
-'invoice_id' => mt_rand(),
-);
-$contribution = civicrm_api3('Contribution', 'Create', 
$contribution_params);
-$id = $contribution['id'];
-$contribution_values = $contribution['values'][$id];
-$out->contribution_invoice_id = $contribution_values['invoice_id'];
-
-return $out;
-}
-
-  /**
-   * Tear down function.
-   */
-public function __destruct() {
-civicrm_api3('ContributionRecur', 'delete', array('id' => 
$this->contribution_recur_id));
-civicrm_api3('Contact', 'delete', array('id' => $this->contact_id));
-}
-}
->>> BRANCH (3c3c5c Save contribution if duplicate invoice id)
diff --git a/sites/all/modules/wmf_civicrm/tests/phpunit/ImportMessageTest.php 
b/sites/all/modules/wmf_civicrm/tests/phpunit/ImportMessageTest.php
deleted file mode 100644
index 36c6166..000
--- a/sites/all/modules/wmf_civicrm/tests/phpunit/ImportMessageTest.php
+++ /dev/null
@@ -1,590 +0,0 @@
-<<< HEAD   (dfc26f Merge branch 'master' into deployment)
-===
- WMF_CAMPAIGNS_OPTION_GROUP_NAME,
-'label' => ImportMessageTest_campaign,
-'value' => ImportMessageTest_campaign,
-) );
-}
-
-public function tearDown() {
-if ( $this->contribution_id ) {
-  $this->callAPISuccess('Contribution', 'delete', array('id' => 
$this->contribution_id));
-}
-parent::tearDown();
-}
-
-/**
- * @dataProvider messageProvider
- */
-public function testMessageInsert( $msg, $expected ) {
-$contribution = 

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/357959 )

Change subject: Merge branch 'master' into deployment
..


Merge branch 'master' into deployment

6e734b83d Fix dumbness of last commit

Change-Id: Ied3f79143689edf7fd3434bc9580a2083d248c24
---
0 files changed, 0 insertions(+), 0 deletions(-)

Approvals:
  jenkins-bot: Verified
  Ejegg: Looks good to me, approved




-- 
To view, visit https://gerrit.wikimedia.org/r/357959
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ied3f79143689edf7fd3434bc9580a2083d248c24
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

[Ejegg (Code Review)]

Ejegg has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/357959 )

Change subject: Merge branch 'master' into deployment
..

Merge branch 'master' into deployment

6e734b83d Fix dumbness of last commit

Change-Id: Ied3f79143689edf7fd3434bc9580a2083d248c24
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/59/357959/1


-- 
To view, visit https://gerrit.wikimedia.org/r/357959
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ied3f79143689edf7fd3434bc9580a2083d248c24
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/357944 )

Change subject: Merge branch 'master' into deployment
..


Merge branch 'master' into deployment

25e944bd3 For multiple matching log lines, pick a consistent one

Change-Id: Ifa21c854b42d15836daaac30d6d4acb3b1582bbb
---
0 files changed, 0 insertions(+), 0 deletions(-)

Approvals:
  jenkins-bot: Verified
  Ejegg: Looks good to me, approved




-- 
To view, visit https://gerrit.wikimedia.org/r/357944
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifa21c854b42d15836daaac30d6d4acb3b1582bbb
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

[Ejegg (Code Review)]

Ejegg has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/357944 )

Change subject: Merge branch 'master' into deployment
..

Merge branch 'master' into deployment

25e944bd3 For multiple matching log lines, pick a consistent one

Change-Id: Ifa21c854b42d15836daaac30d6d4acb3b1582bbb
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/44/357944/1


-- 
To view, visit https://gerrit.wikimedia.org/r/357944
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifa21c854b42d15836daaac30d6d4acb3b1582bbb
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/356885 )

Change subject: Merge branch 'master' into deployment
..


Merge branch 'master' into deployment

f859b7dea More horrifying regexps for ty letter template generation
745d90dfd Update Spanish thank you letter

Change-Id: I753071e2f4744b68373cae06e3dc6311ac9afa29
---
0 files changed, 0 insertions(+), 0 deletions(-)

Approvals:
  jenkins-bot: Verified
  Ejegg: Looks good to me, approved




-- 
To view, visit https://gerrit.wikimedia.org/r/356885
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I753071e2f4744b68373cae06e3dc6311ac9afa29
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

[Ejegg (Code Review)]

Ejegg has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/356885 )

Change subject: Merge branch 'master' into deployment
..

Merge branch 'master' into deployment

f859b7dea More horrifying regexps for ty letter template generation
745d90dfd Update Spanish thank you letter

Change-Id: I753071e2f4744b68373cae06e3dc6311ac9afa29
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/85/356885/1


-- 
To view, visit https://gerrit.wikimedia.org/r/356885
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I753071e2f4744b68373cae06e3dc6311ac9afa29
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/355569 )

Change subject: Merge branch 'master' into deployment
..


Merge branch 'master' into deployment

0715cc0 Audit processors can read normalized fields in logs
a23b082 Unique-ify invoice ID for recurring
c974314 Payments-init consumer can handle 'currency' message field.

Change-Id: I694d02c19ea58a6e56d96fe000c4d7cfe4c7d2b0
---
D sites/all/modules/queue2civicrm/tests/data/payments-init.json
D sites/all/modules/queue2civicrm/tests/phpunit/PaymentsInitQueueTest.php
D sites/all/modules/wmf_audit/tests/AdyenAuditTest.php
D 
sites/all/modules/wmf_audit/tests/data/Adyen/donation_new/settlement_detail_report_batch_2.csv
D sites/all/modules/wmf_audit/tests/data/logs/payments-adyen-20170218.gz
5 files changed, 0 insertions(+), 350 deletions(-)

Approvals:
  XenoRyet: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/sites/all/modules/queue2civicrm/tests/data/payments-init.json 
b/sites/all/modules/queue2civicrm/tests/data/payments-init.json
deleted file mode 100644
index 7ddcc1b..000
--- a/sites/all/modules/queue2civicrm/tests/data/payments-init.json
+++ /dev/null
@@ -1,18 +0,0 @@
-<<< HEAD   (9b7a74 Merge branch 'master' into deployment)
-===
-{
-   "contribution_tracking_id": "12345",
-   "gateway": "testgateway",
-   "order_id": "",
-   "gateway_txn_id": "",
-   "validation_action": "process",
-   "payments_final_status": "complete",
-   "payment_method": "paypal",
-   "payment_submethod": "",
-   "country": "IT",
-   "amount": "2.00",
-   "currency": "EUR",
-   "server": "testpayments1002",
-   "date": "1445990999"
-}
->>> BRANCH (c97431 Payments-init consumer can handle 'currency' message 
field.)
diff --git 
a/sites/all/modules/queue2civicrm/tests/phpunit/PaymentsInitQueueTest.php 
b/sites/all/modules/queue2civicrm/tests/phpunit/PaymentsInitQueueTest.php
deleted file mode 100644
index c727d87..000
--- a/sites/all/modules/queue2civicrm/tests/phpunit/PaymentsInitQueueTest.php
+++ /dev/null
@@ -1,120 +0,0 @@
-<<< HEAD   (9b7a74 Merge branch 'master' into deployment)
-===
-createTable( 'test' );
-   $this->consumer = new PaymentsInitQueueConsumer(
-   'test'
-   );
-   }
-
-   public function testValidMessage() {
-   $message = $this->getMessage();
-   $this->consumer->processMessage( $message );
-
-   $this->compareMessageWithDb( $message );
-   }
-
-   /**
-* The first message for a ct_id / order_id pair needs to be complete
-*
-* @expectedException FredgeDataValidationException
-*/
-   public function testIncompleteMessage() {
-   $message = $this->getMessage();
-   unset( $message['payment_method'] );
-   $this->consumer->processMessage( $message );
-   }
-
-   /**
-* After one complete message has been inserted, a second message
-* with the same ct_id / order_id can update only selected fields
-*/
-   public function testUpdatedMessage() {
-   $message1 = $this->getMessage();
-   $message2 = $this->getMessage();
-   $message2['contribution_tracking_id'] = 
$message1['contribution_tracking_id'];
-   $message2['order_id'] = $message1['order_id'];
-
-   $message1['payments_final_status'] = 'pending';
-   $message2['payments_final_status'] = 'pending';
-   unset( $message2['payment_method'] );
-
-   $this->consumer->processMessage( $message1 );
-   $this->compareMessageWithDb( $message1 );
-
-   $this->consumer->processMessage( $message2 );
-   $updated = array_merge(
-   $message1, $message2
-   );
-   $this->compareMessageWithDb( $updated );
-   }
-
-   protected function compareMessageWithDb( $message ) {
-   $dbEntries = $this->getDbEntries(
-   $message['contribution_tracking_id'], 
$message['order_id']
-   );
-   $this->assertEquals( 1, count( $dbEntries ) );
-   $fields = array(
-   'gateway',  'gateway_txn_id', 'validation_action',
-   'payments_final_status', 'payment_method', 
'payment_submethod',
-   'country', 'amount', 'server'
-   );
-   foreach ( $fields as $field ) {
-   $this->assertEquals( $message[$field], 
$dbEntries[0][$field] );
-   }
-   $this->assertEquals( $message['currency'], 
$dbEntries[0]['currency_code'] );
-   $this->assertEquals(
-   $message['date'], wmf_common_date_civicrm_to_unix( 
$dbEntries[0]['date'] )
-