[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' of https://gerrit.wikimedia.org/r/wiki...
Eileen has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/403874 ) Change subject: Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment .. Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment Change-Id: Ia39284980bb927f4043dd88addfe71396473e42a --- D phpunit.xml 1 file changed, 0 insertions(+), 59 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm refs/changes/74/403874/1 diff --git a/phpunit.xml b/phpunit.xml deleted file mode 100644 index 211d2a2..000 --- a/phpunit.xml +++ /dev/null @@ -1,59 +0,0 @@ -<<< HEAD (354f32 Update CiviCRM submodule) -=== -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 - - - sites/default/civicrm/extensions/org.wikimedia.contacteditor/tests/phpunit - - - ->>> BRANCH (a8d515 Update CiviCRM submodule) -- To view, visit https://gerrit.wikimedia.org/r/403874 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia39284980bb927f4043dd88addfe71396473e42a Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: deployment Gerrit-Owner: Eileen ___ 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' of https://gerrit.wikimedia.org/r/wiki...
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/401648 ) Change subject: Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment .. Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment bcb405b2a89b8f9785dc21386df0ae96dbec58dc Fix for secondary emails on unsubscribe email page Change-Id: If180a20ce6d3627163bf5318b847f93f3960c9ac --- 0 files changed, 0 insertions(+), 0 deletions(-) Approvals: jenkins-bot: Verified Eileen: Looks good to me, approved -- To view, visit https://gerrit.wikimedia.org/r/401648 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If180a20ce6d3627163bf5318b847f93f3960c9ac Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: deployment Gerrit-Owner: Eileen Gerrit-Reviewer: Eileen 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' of https://gerrit.wikimedia.org/r/wiki...
Eileen has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/401648 ) Change subject: Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment .. Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment bcb405b2a89b8f9785dc21386df0ae96dbec58dc Fix for secondary emails on unsubscribe email page Change-Id: If180a20ce6d3627163bf5318b847f93f3960c9ac --- 0 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm refs/changes/48/401648/1 -- To view, visit https://gerrit.wikimedia.org/r/401648 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If180a20ce6d3627163bf5318b847f93f3960c9ac Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: deployment Gerrit-Owner: Eileen ___ 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' of https://gerrit.wikimedia.org/r/wiki...
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/399547 ) Change subject: Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment .. Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment + 994a789bcee7766c404d2f609c40c917bdb9e3de Pass in skip_greeting_proceessing param + 90b7dd4d67a4110fe86a79251aa3de963885b383 Update CiviCRM submodule bd3fadb CRM-21551 Add parameter to support skipping processing greetings when calling api contact.create fc9dc65 Fix for CRM-21180: Inline changes to custom fields aren't reflected in custom greetings. ad68507 Greetings fixes (already upstreamed) 4ded9af Greetings fixes to support contact type change. Change-Id: Iebd7b9a2eeb52e9c4614be896fa9b79482ff9f5c --- 0 files changed, 0 insertions(+), 0 deletions(-) Approvals: jenkins-bot: Verified Eileen: Looks good to me, approved -- To view, visit https://gerrit.wikimedia.org/r/399547 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iebd7b9a2eeb52e9c4614be896fa9b79482ff9f5c Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: deployment Gerrit-Owner: Eileen Gerrit-Reviewer: Eileen 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' of https://gerrit.wikimedia.org/r/wiki...
Eileen has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/399547 ) Change subject: Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment .. Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment + 994a789bcee7766c404d2f609c40c917bdb9e3de Pass in skip_greeting_proceessing param + 90b7dd4d67a4110fe86a79251aa3de963885b383 Update CiviCRM submodule bd3fadb CRM-21551 Add parameter to support skipping processing greetings when calling api contact.create fc9dc65 Fix for CRM-21180: Inline changes to custom fields aren't reflected in custom greetings. ad68507 Greetings fixes (already upstreamed) 4ded9af Greetings fixes to support contact type change. Change-Id: Iebd7b9a2eeb52e9c4614be896fa9b79482ff9f5c --- 0 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm refs/changes/47/399547/1 -- To view, visit https://gerrit.wikimedia.org/r/399547 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iebd7b9a2eeb52e9c4614be896fa9b79482ff9f5c Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: deployment Gerrit-Owner: Eileen ___ 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' of https://gerrit.wikimedia.org/r/wiki...
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/392530 ) Change subject: Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment .. Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment 3cbf0818a75e21dd0eb5029c1ad8c0c721aa111c Add extended reports extension to add Address History tab option. 7292e063a2f0274415ac7066550b985a42022674 Enable extended report Change-Id: I38db002a3b2ca5cfb30b9a6fb1338da03cce26be --- 0 files changed, 0 insertions(+), 0 deletions(-) Approvals: jenkins-bot: Verified Eileen: Looks good to me, approved -- To view, visit https://gerrit.wikimedia.org/r/392530 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I38db002a3b2ca5cfb30b9a6fb1338da03cce26be Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: deployment Gerrit-Owner: Eileen Gerrit-Reviewer: Eileen 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' of https://gerrit.wikimedia.org/r/wiki...
Eileen has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/392530 ) Change subject: Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment .. Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment 3cbf0818a75e21dd0eb5029c1ad8c0c721aa111c Add extended reports extension to add Address History tab option. 7292e063a2f0274415ac7066550b985a42022674 Enable extended report Change-Id: I38db002a3b2ca5cfb30b9a6fb1338da03cce26be --- 0 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm refs/changes/30/392530/1 -- To view, visit https://gerrit.wikimedia.org/r/392530 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I38db002a3b2ca5cfb30b9a6fb1338da03cce26be Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: deployment Gerrit-Owner: Eileen ___ 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' of https://gerrit.wikimedia.org/r/wiki...
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/391743 ) Change subject: Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment .. Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment + e9b6c803daf1606ddfebe598674492e11995c89c Add dedupetools extension. + 705f64cf2abb3802c94c014d2b3ada92c7bea3b1 Tidy up dedupe rules & install dedupetools. Change-Id: I83c715acf1bcc60022d37324833da520eaf941df --- 0 files changed, 0 insertions(+), 0 deletions(-) Approvals: jenkins-bot: Verified Eileen: Looks good to me, approved -- To view, visit https://gerrit.wikimedia.org/r/391743 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I83c715acf1bcc60022d37324833da520eaf941df Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: deployment Gerrit-Owner: Eileen Gerrit-Reviewer: Eileen 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' of https://gerrit.wikimedia.org/r/wiki...
Eileen has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/391743 ) Change subject: Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment .. Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment + e9b6c803daf1606ddfebe598674492e11995c89c Add dedupetools extension. + 705f64cf2abb3802c94c014d2b3ada92c7bea3b1 Tidy up dedupe rules & install dedupetools. Change-Id: I83c715acf1bcc60022d37324833da520eaf941df --- 0 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm refs/changes/43/391743/1 -- To view, visit https://gerrit.wikimedia.org/r/391743 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I83c715acf1bcc60022d37324833da520eaf941df Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: deployment Gerrit-Owner: Eileen ___ 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' of https://gerrit.wikimedia.org/r/wiki...
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/387876 ) Change subject: Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment .. Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment d37b628 Submodule update f0ea364 Hack proximity search to support entering lat& long directly a0959b3 CiviCRM submodule commit 0edfb9d CRM-21371 - An api error when calling drush cvapi should be treated as a drush error 47f6d10 Backport of formatting cleanup. 20ccb2a Remove a trailing space 98efead Fix for overwriting of start_time. 126683d Fix thrown exception in Omnimail. 9841cf7 Rename job_suffix to job_identifier. Change-Id: Ie750fc07c9e8456a62972860142fc68401cf894d --- 0 files changed, 0 insertions(+), 0 deletions(-) Approvals: jenkins-bot: Verified Eileen: Looks good to me, approved -- To view, visit https://gerrit.wikimedia.org/r/387876 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie750fc07c9e8456a62972860142fc68401cf894d Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: deployment Gerrit-Owner: Eileen Gerrit-Reviewer: Eileen 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' of https://gerrit.wikimedia.org/r/wiki...
Eileen has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/387876 ) Change subject: Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment .. Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment d37b628 Submodule update f0ea364 Hack proximity search to support entering lat& long directly a0959b3 CiviCRM submodule commit 0edfb9d CRM-21371 - An api error when calling drush cvapi should be treated as a drush error 47f6d10 Backport of formatting cleanup. 20ccb2a Remove a trailing space 98efead Fix for overwriting of start_time. 126683d Fix thrown exception in Omnimail. 9841cf7 Rename job_suffix to job_identifier. Change-Id: Ie750fc07c9e8456a62972860142fc68401cf894d --- 0 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm refs/changes/76/387876/1 -- To view, visit https://gerrit.wikimedia.org/r/387876 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie750fc07c9e8456a62972860142fc68401cf894d Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: deployment Gerrit-Owner: Eileen ___ 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' of https://gerrit.wikimedia.org/r/wiki...
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/387365 )
Change subject: Merge branch 'master' of
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
..
Merge branch 'master' of
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
9497022 Update CiviCRM submodule
98f3ea1 Revert "CRM-21302 honestly we do all this for nothing, really?"
c0e414d CRM-21302 honestly we do all this for nothing, really?
27c5e47 CRM-21303 fix:dedupe conflicts screen, not all rows visible
53307b2 CRM-21291 remove obsolete code from dedupe.
867f4ca CRM-21304 quash form reload message when refreshing
a25dc24 CRM-21294 Fix js error on dedupe find screen.
37ab362 Fix contacts with multiple primary addresses
2113e55 Always delete 'worse' address
3a4c195 Add link directly to contribution
2b3019f Revert "Log a stack trace for all dedupe queries"
c5de980 blacklist polyfill-php54, update donation-interface
9e1f196 Drush command to delete extraneous log_setting entries.
c08d2c3 Upgrader for switching omnimail job
24d3012 Switch over to new table & entity to track omnimail job progress
c94b61c Switch Omnimail job progress tracking to it's own table.
3419165 Test consolidation in prep for switching away from setting
438e79b Update CiviCRM submodule
5f31c22 CRM-21324 - Support 'null' on date fields in the api
Change-Id: I49384e78db1cabd5c07299c13beeaf4ee7c5a93c
---
D sites/all/modules/wmf_civicrm/tests/phpunit/MergeTest.php
1 file changed, 0 insertions(+), 1,876 deletions(-)
Approvals:
jenkins-bot: Verified
Eileen: Looks good to me, approved
diff --git a/sites/all/modules/wmf_civicrm/tests/phpunit/MergeTest.php
b/sites/all/modules/wmf_civicrm/tests/phpunit/MergeTest.php
deleted file mode 100644
index d0ac11b..000
--- a/sites/all/modules/wmf_civicrm/tests/phpunit/MergeTest.php
+++ /dev/null
@@ -1,1876 +0,0 @@
-<<< HEAD (25c7a3 More debugging for orphan rectifier)
-===
-imitateAdminUser();
-$this->doDuckHunt();
-// Run through the merge first to make sure there aren't pre-existing
contacts in the DB
-// that will ruin the tests.
-$this->callAPISuccess('Job', 'process_batch_merge', array('mode' =>
'safe'));
-
-$this->contactID =
$this->breedDuck(array(wmf_civicrm_get_custom_field_name('do_not_solicit') =>
0));
-$this->contactID2 =
$this->breedDuck(array(wmf_civicrm_get_custom_field_name('do_not_solicit') =>
1));
- }
-
- public function tearDown() {
-$this->callAPISuccess('Contribution', 'get', array(
- 'contact_id' => array('IN' => array($this->contactID,
$this->contactID2)),
- 'api.Contribution.delete' => 1,
-));
-$this->callAPISuccess('Contact', 'delete', array('id' =>
$this->contactID));
-$this->callAPISuccess('Contact', 'delete', array('id' =>
$this->contactID2));
-parent::tearDown();
- }
-
- /**
- * Test that the merge hook causes our custom fields to not be treated as
conflicts.
- *
- * We also need to check the custom data fields afterwards.
- */
- public function testMergeHook() {
-$this->callAPISuccess('Contribution', 'create', array(
- 'contact_id' => $this->contactID,
- 'financial_type_id' => 'Cash',
- 'total_amount' => 10,
- 'currency' => 'USD',
- // Should cause 'is_2014 to be true.
- 'receive_date' => '2014-08-04',
- wmf_civicrm_get_custom_field_name('original_currency') => 'NZD',
- wmf_civicrm_get_custom_field_name('original_amount') => 8,
-));
-$this->callAPISuccess('Contribution', 'create', array(
- 'contact_id' => $this->contactID2,
- 'financial_type_id' => 'Cash',
- 'total_amount' => 5,
- 'currency' => 'USD',
- // Should cause 'is_2012_donor to be true.
- 'receive_date' => '2013-01-04',
-));
-$this->callAPISuccess('Contribution', 'create', array(
- 'contact_id' => $this->contactID2,
- 'financial_type_id' => 'Cash',
- 'total_amount' => 9,
- 'currency' => 'NZD',
- // Should cause 'is_2015_donor to be true.
- 'receive_date' => '2016-04-04',
-));
-$contact = $this->callAPISuccess('Contact', 'get', array(
- 'id' => $this->contactID,
- 'sequential' => 1,
- 'return' =>
array(wmf_civicrm_get_custom_field_name('lifetime_usd_total'),
wmf_civicrm_get_custom_field_name('do_not_solicit')),
-));
-$this->assertEquals(10,
$contact['values'][0][wmf_civicrm_get_custom_field_name('lifetime_usd_total')]);
-$result = $this->callAPISuccess('Job', 'process_batch_merge', array(
- 'criteria' => array('contact' => array('id' => array('IN' =>
array($this->contactID, $this->contactID2,
-));
-$this->assertEquals(1, count($result['values']['merged']));
-$contact = $this->callAPISuccess('Contact', 'get', array(
- 'id' => $this->contactID,
- 'sequential' => 1,
- 'return' => array(
-
[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' of https://gerrit.wikimedia.org/r/wiki...
Eileen has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/387365 )
Change subject: Merge branch 'master' of
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
..
Merge branch 'master' of
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
9497022 Update CiviCRM submodule
98f3ea1 Revert "CRM-21302 honestly we do all this for nothing, really?"
c0e414d CRM-21302 honestly we do all this for nothing, really?
27c5e47 CRM-21303 fix:dedupe conflicts screen, not all rows visible
53307b2 CRM-21291 remove obsolete code from dedupe.
867f4ca CRM-21304 quash form reload message when refreshing
a25dc24 CRM-21294 Fix js error on dedupe find screen.
37ab362 Fix contacts with multiple primary addresses
2113e55 Always delete 'worse' address
3a4c195 Add link directly to contribution
2b3019f Revert "Log a stack trace for all dedupe queries"
c5de980 blacklist polyfill-php54, update donation-interface
9e1f196 Drush command to delete extraneous log_setting entries.
c08d2c3 Upgrader for switching omnimail job
24d3012 Switch over to new table & entity to track omnimail job progress
c94b61c Switch Omnimail job progress tracking to it's own table.
3419165 Test consolidation in prep for switching away from setting
438e79b Update CiviCRM submodule
5f31c22 CRM-21324 - Support 'null' on date fields in the api
Change-Id: I49384e78db1cabd5c07299c13beeaf4ee7c5a93c
---
D sites/all/modules/wmf_civicrm/tests/phpunit/MergeTest.php
1 file changed, 0 insertions(+), 1,876 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm
refs/changes/65/387365/1
diff --git a/sites/all/modules/wmf_civicrm/tests/phpunit/MergeTest.php
b/sites/all/modules/wmf_civicrm/tests/phpunit/MergeTest.php
deleted file mode 100644
index d0ac11b..000
--- a/sites/all/modules/wmf_civicrm/tests/phpunit/MergeTest.php
+++ /dev/null
@@ -1,1876 +0,0 @@
-<<< HEAD (25c7a3 More debugging for orphan rectifier)
-===
-imitateAdminUser();
-$this->doDuckHunt();
-// Run through the merge first to make sure there aren't pre-existing
contacts in the DB
-// that will ruin the tests.
-$this->callAPISuccess('Job', 'process_batch_merge', array('mode' =>
'safe'));
-
-$this->contactID =
$this->breedDuck(array(wmf_civicrm_get_custom_field_name('do_not_solicit') =>
0));
-$this->contactID2 =
$this->breedDuck(array(wmf_civicrm_get_custom_field_name('do_not_solicit') =>
1));
- }
-
- public function tearDown() {
-$this->callAPISuccess('Contribution', 'get', array(
- 'contact_id' => array('IN' => array($this->contactID,
$this->contactID2)),
- 'api.Contribution.delete' => 1,
-));
-$this->callAPISuccess('Contact', 'delete', array('id' =>
$this->contactID));
-$this->callAPISuccess('Contact', 'delete', array('id' =>
$this->contactID2));
-parent::tearDown();
- }
-
- /**
- * Test that the merge hook causes our custom fields to not be treated as
conflicts.
- *
- * We also need to check the custom data fields afterwards.
- */
- public function testMergeHook() {
-$this->callAPISuccess('Contribution', 'create', array(
- 'contact_id' => $this->contactID,
- 'financial_type_id' => 'Cash',
- 'total_amount' => 10,
- 'currency' => 'USD',
- // Should cause 'is_2014 to be true.
- 'receive_date' => '2014-08-04',
- wmf_civicrm_get_custom_field_name('original_currency') => 'NZD',
- wmf_civicrm_get_custom_field_name('original_amount') => 8,
-));
-$this->callAPISuccess('Contribution', 'create', array(
- 'contact_id' => $this->contactID2,
- 'financial_type_id' => 'Cash',
- 'total_amount' => 5,
- 'currency' => 'USD',
- // Should cause 'is_2012_donor to be true.
- 'receive_date' => '2013-01-04',
-));
-$this->callAPISuccess('Contribution', 'create', array(
- 'contact_id' => $this->contactID2,
- 'financial_type_id' => 'Cash',
- 'total_amount' => 9,
- 'currency' => 'NZD',
- // Should cause 'is_2015_donor to be true.
- 'receive_date' => '2016-04-04',
-));
-$contact = $this->callAPISuccess('Contact', 'get', array(
- 'id' => $this->contactID,
- 'sequential' => 1,
- 'return' =>
array(wmf_civicrm_get_custom_field_name('lifetime_usd_total'),
wmf_civicrm_get_custom_field_name('do_not_solicit')),
-));
-$this->assertEquals(10,
$contact['values'][0][wmf_civicrm_get_custom_field_name('lifetime_usd_total')]);
-$result = $this->callAPISuccess('Job', 'process_batch_merge', array(
- 'criteria' => array('contact' => array('id' => array('IN' =>
array($this->contactID, $this->contactID2,
-));
-$this->assertEquals(1, count($result['values']['merged']));
-$contact = $this->callAPISuccess('Contact', 'get', array(
- 'id' => $this->contactID,
- 'sequential' => 1,
- 'return' => arra
[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' of https://gerrit.wikimedia.org/r/wiki...
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/383954 ) Change subject: Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment .. Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment 9fa46538dbb848bdf9ebd9f48050ff4ca5e796db Fix Omnimailing.load job to bypass creating recipients & to use internal replace, add test. Change-Id: I8da51794f7c4f1d67046beac039a4de0ea897bb8 --- 0 files changed, 0 insertions(+), 0 deletions(-) Approvals: jenkins-bot: Verified Eileen: Looks good to me, approved -- To view, visit https://gerrit.wikimedia.org/r/383954 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8da51794f7c4f1d67046beac039a4de0ea897bb8 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: deployment Gerrit-Owner: Eileen Gerrit-Reviewer: Eileen 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' of https://gerrit.wikimedia.org/r/wiki...
Eileen has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/383954 ) Change subject: Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment .. Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment 9fa46538dbb848bdf9ebd9f48050ff4ca5e796db Fix Omnimailing.load job to bypass creating recipients & to use internal replace, add test. Change-Id: I8da51794f7c4f1d67046beac039a4de0ea897bb8 --- 0 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm refs/changes/54/383954/1 -- To view, visit https://gerrit.wikimedia.org/r/383954 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8da51794f7c4f1d67046beac039a4de0ea897bb8 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: deployment Gerrit-Owner: Eileen ___ 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' of https://gerrit.wikimedia.org/r/wiki...
Eileen has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/383296 )
Change subject: Merge branch 'master' of
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
..
Merge branch 'master' of
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
+ 3fdd4449ae46f4bc6c8586e888c7c700f395c84d The big group clean up.
+ bc006f63575a42223710cecfc9f494ad07c03ae8 Last change introduced an error when
no address conflict exits
Change-Id: Ie0a05f08d5a3b4b7e2d69baecba45a5f95e12cc6
---
D sites/all/modules/wmf_civicrm/tests/phpunit/MergeTest.php
1 file changed, 0 insertions(+), 1,795 deletions(-)
Approvals:
jenkins-bot: Verified
Eileen: Looks good to me, approved
diff --git a/sites/all/modules/wmf_civicrm/tests/phpunit/MergeTest.php
b/sites/all/modules/wmf_civicrm/tests/phpunit/MergeTest.php
deleted file mode 100644
index 14c3bc3..000
--- a/sites/all/modules/wmf_civicrm/tests/phpunit/MergeTest.php
+++ /dev/null
@@ -1,1795 +0,0 @@
-<<< HEAD (00da4b Merge branch 'master' of
https://gerrit.wikimedia.org/r/wiki)
-===
-imitateAdminUser();
-$this->doDuckHunt();
-// Run through the merge first to make sure there aren't pre-existing
contacts in the DB
-// that will ruin the tests.
-$this->callAPISuccess('Job', 'process_batch_merge', array('mode' =>
'safe'));
-
-$this->contactID =
$this->breedDuck(array(wmf_civicrm_get_custom_field_name('do_not_solicit') =>
0));
-$this->contactID2 =
$this->breedDuck(array(wmf_civicrm_get_custom_field_name('do_not_solicit') =>
1));
- }
-
- public function tearDown() {
-$this->callAPISuccess('Contribution', 'get', array(
- 'contact_id' => array('IN' => array($this->contactID,
$this->contactID2)),
- 'api.Contribution.delete' => 1,
-));
-$this->callAPISuccess('Contact', 'delete', array('id' =>
$this->contactID));
-$this->callAPISuccess('Contact', 'delete', array('id' =>
$this->contactID2));
-parent::tearDown();
- }
-
- /**
- * Test that the merge hook causes our custom fields to not be treated as
conflicts.
- *
- * We also need to check the custom data fields afterwards.
- */
- public function testMergeHook() {
-$this->callAPISuccess('Contribution', 'create', array(
- 'contact_id' => $this->contactID,
- 'financial_type_id' => 'Cash',
- 'total_amount' => 10,
- 'currency' => 'USD',
- // Should cause 'is_2014 to be true.
- 'receive_date' => '2014-08-04',
- wmf_civicrm_get_custom_field_name('original_currency') => 'NZD',
- wmf_civicrm_get_custom_field_name('original_amount') => 8,
-));
-$this->callAPISuccess('Contribution', 'create', array(
- 'contact_id' => $this->contactID2,
- 'financial_type_id' => 'Cash',
- 'total_amount' => 5,
- 'currency' => 'USD',
- // Should cause 'is_2012_donor to be true.
- 'receive_date' => '2013-01-04',
-));
-$this->callAPISuccess('Contribution', 'create', array(
- 'contact_id' => $this->contactID2,
- 'financial_type_id' => 'Cash',
- 'total_amount' => 9,
- 'currency' => 'NZD',
- // Should cause 'is_2015_donor to be true.
- 'receive_date' => '2016-04-04',
-));
-$contact = $this->callAPISuccess('Contact', 'get', array(
- 'id' => $this->contactID,
- 'sequential' => 1,
- 'return' =>
array(wmf_civicrm_get_custom_field_name('lifetime_usd_total'),
wmf_civicrm_get_custom_field_name('do_not_solicit')),
-));
-$this->assertEquals(10,
$contact['values'][0][wmf_civicrm_get_custom_field_name('lifetime_usd_total')]);
-$result = $this->callAPISuccess('Job', 'process_batch_merge', array(
- 'criteria' => array('contact' => array('id' => array('IN' =>
array($this->contactID, $this->contactID2,
-));
-$this->assertEquals(1, count($result['values']['merged']));
-$contact = $this->callAPISuccess('Contact', 'get', array(
- 'id' => $this->contactID,
- 'sequential' => 1,
- 'return' => array(
-wmf_civicrm_get_custom_field_name('lifetime_usd_total'),
-wmf_civicrm_get_custom_field_name('do_not_solicit'),
-wmf_civicrm_get_custom_field_name('last_donation_amount'),
-wmf_civicrm_get_custom_field_name('last_donation_currency'),
-wmf_civicrm_get_custom_field_name('last_donation_usd'),
-wmf_civicrm_get_custom_field_name('last_donation_date'),
-wmf_civicrm_get_custom_field_name('is_2011_donor'),
-wmf_civicrm_get_custom_field_name('is_2012_donor'),
-wmf_civicrm_get_custom_field_name('is_2013_donor'),
-wmf_civicrm_get_custom_field_name('is_2014_donor'),
-wmf_civicrm_get_custom_field_name('is_2015_donor'),
-wmf_civicrm_get_custom_field_name('is_2016_donor'),
- ),
-));
-$this->assertEquals(24,
$contact['values'][0][wmf_civicrm_get_custom_field_name('lifetime_usd_total')]);
-$t
[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' of https://gerrit.wikimedia.org/r/wiki...
Eileen has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/383296 )
Change subject: Merge branch 'master' of
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
..
Merge branch 'master' of
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
+ 3fdd4449ae46f4bc6c8586e888c7c700f395c84d The big group clean up.
+ bc006f63575a42223710cecfc9f494ad07c03ae8 Last change introduced an error when
no address conflict exits
Change-Id: Ie0a05f08d5a3b4b7e2d69baecba45a5f95e12cc6
---
D sites/all/modules/wmf_civicrm/tests/phpunit/MergeTest.php
1 file changed, 0 insertions(+), 1,795 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm
refs/changes/96/383296/1
diff --git a/sites/all/modules/wmf_civicrm/tests/phpunit/MergeTest.php
b/sites/all/modules/wmf_civicrm/tests/phpunit/MergeTest.php
deleted file mode 100644
index 14c3bc3..000
--- a/sites/all/modules/wmf_civicrm/tests/phpunit/MergeTest.php
+++ /dev/null
@@ -1,1795 +0,0 @@
-<<< HEAD (00da4b Merge branch 'master' of
https://gerrit.wikimedia.org/r/wiki)
-===
-imitateAdminUser();
-$this->doDuckHunt();
-// Run through the merge first to make sure there aren't pre-existing
contacts in the DB
-// that will ruin the tests.
-$this->callAPISuccess('Job', 'process_batch_merge', array('mode' =>
'safe'));
-
-$this->contactID =
$this->breedDuck(array(wmf_civicrm_get_custom_field_name('do_not_solicit') =>
0));
-$this->contactID2 =
$this->breedDuck(array(wmf_civicrm_get_custom_field_name('do_not_solicit') =>
1));
- }
-
- public function tearDown() {
-$this->callAPISuccess('Contribution', 'get', array(
- 'contact_id' => array('IN' => array($this->contactID,
$this->contactID2)),
- 'api.Contribution.delete' => 1,
-));
-$this->callAPISuccess('Contact', 'delete', array('id' =>
$this->contactID));
-$this->callAPISuccess('Contact', 'delete', array('id' =>
$this->contactID2));
-parent::tearDown();
- }
-
- /**
- * Test that the merge hook causes our custom fields to not be treated as
conflicts.
- *
- * We also need to check the custom data fields afterwards.
- */
- public function testMergeHook() {
-$this->callAPISuccess('Contribution', 'create', array(
- 'contact_id' => $this->contactID,
- 'financial_type_id' => 'Cash',
- 'total_amount' => 10,
- 'currency' => 'USD',
- // Should cause 'is_2014 to be true.
- 'receive_date' => '2014-08-04',
- wmf_civicrm_get_custom_field_name('original_currency') => 'NZD',
- wmf_civicrm_get_custom_field_name('original_amount') => 8,
-));
-$this->callAPISuccess('Contribution', 'create', array(
- 'contact_id' => $this->contactID2,
- 'financial_type_id' => 'Cash',
- 'total_amount' => 5,
- 'currency' => 'USD',
- // Should cause 'is_2012_donor to be true.
- 'receive_date' => '2013-01-04',
-));
-$this->callAPISuccess('Contribution', 'create', array(
- 'contact_id' => $this->contactID2,
- 'financial_type_id' => 'Cash',
- 'total_amount' => 9,
- 'currency' => 'NZD',
- // Should cause 'is_2015_donor to be true.
- 'receive_date' => '2016-04-04',
-));
-$contact = $this->callAPISuccess('Contact', 'get', array(
- 'id' => $this->contactID,
- 'sequential' => 1,
- 'return' =>
array(wmf_civicrm_get_custom_field_name('lifetime_usd_total'),
wmf_civicrm_get_custom_field_name('do_not_solicit')),
-));
-$this->assertEquals(10,
$contact['values'][0][wmf_civicrm_get_custom_field_name('lifetime_usd_total')]);
-$result = $this->callAPISuccess('Job', 'process_batch_merge', array(
- 'criteria' => array('contact' => array('id' => array('IN' =>
array($this->contactID, $this->contactID2,
-));
-$this->assertEquals(1, count($result['values']['merged']));
-$contact = $this->callAPISuccess('Contact', 'get', array(
- 'id' => $this->contactID,
- 'sequential' => 1,
- 'return' => array(
-wmf_civicrm_get_custom_field_name('lifetime_usd_total'),
-wmf_civicrm_get_custom_field_name('do_not_solicit'),
-wmf_civicrm_get_custom_field_name('last_donation_amount'),
-wmf_civicrm_get_custom_field_name('last_donation_currency'),
-wmf_civicrm_get_custom_field_name('last_donation_usd'),
-wmf_civicrm_get_custom_field_name('last_donation_date'),
-wmf_civicrm_get_custom_field_name('is_2011_donor'),
-wmf_civicrm_get_custom_field_name('is_2012_donor'),
-wmf_civicrm_get_custom_field_name('is_2013_donor'),
-wmf_civicrm_get_custom_field_name('is_2014_donor'),
-wmf_civicrm_get_custom_field_name('is_2015_donor'),
-wmf_civicrm_get_custom_field_name('is_2016_donor'),
- ),
-));
-$this->assertEquals(24,
$contact['values'][0][wmf_civicrm_get_custom_field_name('lifetime_usd_tot
[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' of https://gerrit.wikimedia.org/r/wiki...
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/379416 ) Change subject: Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment .. Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment + 68732e38560d68feaf0899efb0d7f47a31e049fd Define a constant to allow switching dbs for phpunit + 8973ebe802e98ada6cd663e5180ec9eff50f5335 Orphan Slayer Module + b961f2c0e51d59f467efaa2a193554654cdb0e3f Minor refactor on Omnimail classes. + d4277e9c65e82c54c80166faeb59b775db6c09cd Update Omnimail vendor dir to support offset on recipients. + d7a2c9bd2a23ec98bdba0c984332699ad6e22a3a Update Omnimail Recipient.load to support offset & limit + 2488f25eea81e748f3336934ce789ad7ed616bb9 Update Omnimail jobs to support storing settings about multiple jobs. + f060a249b60a9df7c6673ade540120f754d6a7dd Update Omnimail recipient load to support parameterised batching. Change-Id: Ie2a729e222ce3b289551ecb5be0da8c190d3bef8 --- D phpunit.xml 1 file changed, 0 insertions(+), 53 deletions(-) Approvals: jenkins-bot: Verified Eileen: Looks good to me, approved diff --git a/phpunit.xml b/phpunit.xml deleted file mode 100644 index 66a2d0a..000 --- a/phpunit.xml +++ /dev/null @@ -1,53 +0,0 @@ -<<< HEAD (0fb467 Fix last vendor commit) -=== -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/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 (f060a2 Update Omnimail recipient load to support parameterised batc) -- To view, visit https://gerrit.wikimedia.org/r/379416 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie2a729e222ce3b289551ecb5be0da8c190d3bef8 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: deployment Gerrit-Owner: Eileen Gerrit-Reviewer: Eileen 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' of https://gerrit.wikimedia.org/r/wiki...
Eileen has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/379416 ) Change subject: Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment .. Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment + 68732e38560d68feaf0899efb0d7f47a31e049fd Define a constant to allow switching dbs for phpunit + 8973ebe802e98ada6cd663e5180ec9eff50f5335 Orphan Slayer Module + b961f2c0e51d59f467efaa2a193554654cdb0e3f Minor refactor on Omnimail classes. + d4277e9c65e82c54c80166faeb59b775db6c09cd Update Omnimail vendor dir to support offset on recipients. + d7a2c9bd2a23ec98bdba0c984332699ad6e22a3a Update Omnimail Recipient.load to support offset & limit + 2488f25eea81e748f3336934ce789ad7ed616bb9 Update Omnimail jobs to support storing settings about multiple jobs. + f060a249b60a9df7c6673ade540120f754d6a7dd Update Omnimail recipient load to support parameterised batching. Change-Id: Ie2a729e222ce3b289551ecb5be0da8c190d3bef8 --- D phpunit.xml 1 file changed, 0 insertions(+), 53 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm refs/changes/16/379416/1 diff --git a/phpunit.xml b/phpunit.xml deleted file mode 100644 index 66a2d0a..000 --- a/phpunit.xml +++ /dev/null @@ -1,53 +0,0 @@ -<<< HEAD (0fb467 Fix last vendor commit) -=== -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/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 (f060a2 Update Omnimail recipient load to support parameterised batc) -- To view, visit https://gerrit.wikimedia.org/r/379416 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie2a729e222ce3b289551ecb5be0da8c190d3bef8 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: deployment Gerrit-Owner: Eileen ___ 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' of https://gerrit.wikimedia.org/r/wiki...
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/379124 ) Change subject: Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment .. Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment + 9c66737cbd02e1cc343897e500d1ce7ec4b774ab Fix date miscalculation on retrieving mailings. + 75db28743331c41026431effaad77eca7d8d592f CiviCRM submodule update - 30eb051 CRM-21011 Sort out tag descriptions when displaying better Change-Id: I299ca2535c92d60c8a33f547877656136174a01b --- 0 files changed, 0 insertions(+), 0 deletions(-) Approvals: jenkins-bot: Verified Eileen: Looks good to me, approved -- To view, visit https://gerrit.wikimedia.org/r/379124 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I299ca2535c92d60c8a33f547877656136174a01b Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: deployment Gerrit-Owner: Eileen Gerrit-Reviewer: Eileen 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' of https://gerrit.wikimedia.org/r/wiki...
Eileen has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/379124 ) Change subject: Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment .. Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment + 9c66737cbd02e1cc343897e500d1ce7ec4b774ab Fix date miscalculation on retrieving mailings. + 75db28743331c41026431effaad77eca7d8d592f CiviCRM submodule update - 30eb051 CRM-21011 Sort out tag descriptions when displaying better Change-Id: I299ca2535c92d60c8a33f547877656136174a01b --- 0 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm refs/changes/24/379124/1 -- To view, visit https://gerrit.wikimedia.org/r/379124 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I299ca2535c92d60c8a33f547877656136174a01b Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: deployment Gerrit-Owner: Eileen ___ 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' of https://gerrit.wikimedia.org/r/wiki...
Eileen has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/378820 ) Change subject: Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment .. Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment + 3bda7a3fbf097962100afdff9514f2118475920a Update omnimail to validate dates & silverpop package to validate returning xml + 429463ff35c6510dcd165b2faeabb97cd8c81dfa Update composer packages Change-Id: If6b6d3056e126b33643a8d2e9f6c0a4146b08dfb --- 0 files changed, 0 insertions(+), 0 deletions(-) Approvals: jenkins-bot: Verified Eileen: Looks good to me, approved -- To view, visit https://gerrit.wikimedia.org/r/378820 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If6b6d3056e126b33643a8d2e9f6c0a4146b08dfb Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: deployment Gerrit-Owner: Eileen Gerrit-Reviewer: Eileen 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' of https://gerrit.wikimedia.org/r/wiki...
Eileen has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/378820 ) Change subject: Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment .. Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment + 3bda7a3fbf097962100afdff9514f2118475920a Update omnimail to validate dates & silverpop package to validate returning xml + 429463ff35c6510dcd165b2faeabb97cd8c81dfa Update composer packages Change-Id: If6b6d3056e126b33643a8d2e9f6c0a4146b08dfb --- 0 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm refs/changes/20/378820/1 -- To view, visit https://gerrit.wikimedia.org/r/378820 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If6b6d3056e126b33643a8d2e9f6c0a4146b08dfb Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: deployment Gerrit-Owner: Eileen ___ 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' of https://gerrit.wikimedia.org/r/wiki...
Eileen has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/378808 ) Change subject: Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment .. Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment 3bda7a3fbf097962100afdff9514f2118475920a Update omnimail to validate dates & silverpop package to validate returning xml Change-Id: Iffb4c13a2bd0e276ba2c3b7a69983a27173a4a56 --- 0 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm refs/changes/08/378808/1 -- To view, visit https://gerrit.wikimedia.org/r/378808 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iffb4c13a2bd0e276ba2c3b7a69983a27173a4a56 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: deployment Gerrit-Owner: Eileen ___ 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' of https://gerrit.wikimedia.org/r/wiki...
Eileen has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/377699 ) Change subject: Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment .. Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment + eb551b92f01ad73aa6d2cb611070ba7e3a6217b3 Update Omnimail plugin to allow setting offset + 2d36e706cfd611373fde26b191d83bef2c8ad776 Another attempt - Update Omnimail plugin to allow setting offset + ff49612f65668c5df4d470a4150ec3f3cd0d245a Update Omnimail to use offset Change-Id: I9daf09bf23897d99f473b9df557641ea12c1fe28 --- 0 files changed, 0 insertions(+), 0 deletions(-) Approvals: jenkins-bot: Verified Eileen: Looks good to me, approved -- To view, visit https://gerrit.wikimedia.org/r/377699 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9daf09bf23897d99f473b9df557641ea12c1fe28 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: deployment Gerrit-Owner: Eileen Gerrit-Reviewer: Eileen 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' of https://gerrit.wikimedia.org/r/wiki...
Eileen has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/377699 ) Change subject: Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment .. Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment + eb551b92f01ad73aa6d2cb611070ba7e3a6217b3 Update Omnimail plugin to allow setting offset + 2d36e706cfd611373fde26b191d83bef2c8ad776 Another attempt - Update Omnimail plugin to allow setting offset + ff49612f65668c5df4d470a4150ec3f3cd0d245a Update Omnimail to use offset Change-Id: I9daf09bf23897d99f473b9df557641ea12c1fe28 --- 0 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm refs/changes/99/377699/1 -- To view, visit https://gerrit.wikimedia.org/r/377699 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9daf09bf23897d99f473b9df557641ea12c1fe28 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: deployment Gerrit-Owner: Eileen ___ 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' of https://gerrit.wikimedia.org/r/wiki...
Eileen has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/377696 ) Change subject: Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment .. Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment + eb551b92f01ad73aa6d2cb611070ba7e3a6217b3 Update Omnimail plugin to allow setting offset + 2d36e706cfd611373fde26b191d83bef2c8ad776 Another attempt - Update Omnimail plugin to allow setting offset + ff49612f65668c5df4d470a4150ec3f3cd0d245a Update Omnimail to use offset Change-Id: I36b6dd8779e18bf5cad5a14abc253b697cf450cf --- 0 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm refs/changes/96/377696/1 -- To view, visit https://gerrit.wikimedia.org/r/377696 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I36b6dd8779e18bf5cad5a14abc253b697cf450cf Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: deployment Gerrit-Owner: Eileen ___ 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' of https://gerrit.wikimedia.org/r/wiki...
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/376474 ) Change subject: Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment .. Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment dbc06186f9174613d3971a7bcc6734c5a42105c2 Submodule commit e4bcc74 Revert Temporarily hack out cache clearing, for test purposes only Change-Id: I8ce0a8e352019b1d6fdf52ee1d0da1aff980e3d3 --- 0 files changed, 0 insertions(+), 0 deletions(-) Approvals: jenkins-bot: Verified Eileen: Looks good to me, approved -- To view, visit https://gerrit.wikimedia.org/r/376474 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8ce0a8e352019b1d6fdf52ee1d0da1aff980e3d3 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: deployment Gerrit-Owner: Eileen Gerrit-Reviewer: Eileen 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' of https://gerrit.wikimedia.org/r/wiki...
Eileen has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/376474 ) Change subject: Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment .. Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment dbc06186f9174613d3971a7bcc6734c5a42105c2 Submodule commit e4bcc74 Revert Temporarily hack out cache clearing, for test purposes only Change-Id: I8ce0a8e352019b1d6fdf52ee1d0da1aff980e3d3 --- 0 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm refs/changes/74/376474/1 -- To view, visit https://gerrit.wikimedia.org/r/376474 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8ce0a8e352019b1d6fdf52ee1d0da1aff980e3d3 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: deployment Gerrit-Owner: Eileen ___ 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' of https://gerrit.wikimedia.org/r/wiki...
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/376459 )
Change subject: Merge branch 'master' of
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
..
Merge branch 'master' of
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
+ fd78777e7fc3edb41baa74fbc179a713152c1a38 Delete half-baked Silverpop import
code
+ 1f79f4ff4aac24371b5b482084d0cefaab51567e Resolve diacritic merge conflicts.
+ 8c5e76b1805a8435b956e48784692fc159738e62 Do not save 0 or other invalid
values to city field.
+ 58f7a315df44a521aedd8d337e3dda9f7b6b4cc5 Submodule commit
Submodule commit
62a0adb Temporarily hack out cache clearing, for test purposes only
7a4fdf9 Fix spelling error.
1f5af85 Follow patch from QA on find duplicates task
245b870 Remove auto limit of 25
Change-Id: If13e893b4a2f8d84428277e2b30d72aed25caf65
---
D sites/all/modules/wmf_civicrm/tests/phpunit/AddressImportTest.php
D sites/all/modules/wmf_civicrm/tests/phpunit/MergeTest.php
M sites/all/modules/wmf_communication/wmf_communication.info
3 files changed, 0 insertions(+), 1,638 deletions(-)
Approvals:
jenkins-bot: Verified
Eileen: Looks good to me, approved
diff --git a/sites/all/modules/wmf_civicrm/tests/phpunit/AddressImportTest.php
b/sites/all/modules/wmf_civicrm/tests/phpunit/AddressImportTest.php
deleted file mode 100644
index 1ed9ccb..000
--- a/sites/all/modules/wmf_civicrm/tests/phpunit/AddressImportTest.php
+++ /dev/null
@@ -1,121 +0,0 @@
-<<< HEAD (764bfe Merge branch 'master' of
https://gerrit.wikimedia.org/r/wiki)
-===
-callAPISuccess('Contact', 'create', array(
- 'first_name' => 'Minnie', 'last_name' => 'Mouse', 'contact_type' =>
'Individual', 'email' => 'min...@mouse.org')
-);
-$this->contactID = $contact['id'];
- }
-
- public function tearDown() {
-CRM_Core_DAO::executeQuery("DELETE FROM civicrm_contact WHERE last_name =
'Mouse'");
- }
-
- /**
- * Test creating an address with void data does not create an address.
- */
- public function testAddressImportVoidData() {
-$msg = array(
- 'currency' => 'USD',
- 'date' => time(),
- 'last_name' => 'Mouse',
- 'email' => 'nob...@wikimedia.org',
- 'gateway' => 'test_gateway',
- 'gateway_txn_id' => mt_rand(),
- 'gross' => '1.23',
- 'payment_method' => 'cc',
- 'street_address' => 'N0NE PROVIDED',
- 'postal_code' => 0,
-);
-
-$contribution = wmf_civicrm_contribution_message_import($msg);
-$addresses = $this->callAPISuccess('Address', 'get', array('contact_id' =>
$contribution['contact_id']));
-$this->assertEquals(0, $addresses['count']);
- }
-
- /**
- * Test creating an address not use void data.
- *
- * @dataProvider getVoidValues
- *
- * @param string $voidValue
- */
- public function testAddressImportSkipVoidData($voidValue) {
-$msg = array(
- 'currency' => 'USD',
- 'date' => time(),
- 'last_name' => 'Mouse',
- 'email' => 'nob...@wikimedia.org',
- 'gateway' => 'test_gateway',
- 'gateway_txn_id' => mt_rand(),
- 'gross' => '1.23',
- 'payment_method' => 'cc',
- 'street_address' => 'really cool place',
- 'postal_code' => $voidValue,
- 'city' => $voidValue,
- 'country' => 'US',
-);
-
-$contribution = wmf_civicrm_contribution_message_import($msg);
-$address = $this->callAPISuccessGetSingle('Address', array('contact_id'
=> $contribution['contact_id']));
-$this->assertTrue(!isset($address['city']));
-$this->assertTrue(!isset($address['postal_code']));
- }
-
- /**
- * Get values which should not be stored to the DB.
- *
- * @return array
- */
- public function getVoidValues() {
-return array(
- array('0'),
- array(0),
- array('NoCity'),
- array('City/Town'),
-);
- }
-
- /**
- * Test creating an address with void data does not create an address.
- *
- * In this case the contact already exists.
- */
- public function testAddressImportVoidDataContactExists() {
-$msg = array(
- 'contact_id' => $this->contactID,
- 'currency' => 'USD',
- 'date' => time(),
- 'last_name' => 'Mouse',
- 'email' => 'nob...@wikimedia.org',
- 'gateway' => 'test_gateway',
- 'gateway_txn_id' => mt_rand(),
- 'gross' => '1.23',
- 'payment_method' => 'cc',
- 'street_address' => 'N0NE PROVIDED',
- 'postal_code' => 0,
-);
-
-$contribution = wmf_civicrm_contribution_message_import($msg);
-$addresses = $this->callAPISuccess('Address', 'get', array('contact_id' =>
$contribution['contact_id']));
-$this->assertEquals(0, $addresses['count']);
- }
-
-}
->>> BRANCH (58f7a3 Submodule commit)
diff --git a/sites/all/modules/wmf_civicrm/tests/phpunit/MergeTest.php
b/sites/all/modules/wmf_civicrm/tests/phpunit/MergeTest.php
deleted file mode 100644
index aeb87ea..
[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' of https://gerrit.wikimedia.org/r/wiki...
Eileen has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/376459 )
Change subject: Merge branch 'master' of
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
..
Merge branch 'master' of
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
+ fd78777e7fc3edb41baa74fbc179a713152c1a38 Delete half-baked Silverpop import
code
+ 1f79f4ff4aac24371b5b482084d0cefaab51567e Resolve diacritic merge conflicts.
+ 8c5e76b1805a8435b956e48784692fc159738e62 Do not save 0 or other invalid
values to city field.
+ 58f7a315df44a521aedd8d337e3dda9f7b6b4cc5 Submodule commit
Submodule commit
62a0adb Temporarily hack out cache clearing, for test purposes only
7a4fdf9 Fix spelling error.
1f5af85 Follow patch from QA on find duplicates task
245b870 Remove auto limit of 25
Change-Id: If13e893b4a2f8d84428277e2b30d72aed25caf65
---
D sites/all/modules/wmf_civicrm/tests/phpunit/AddressImportTest.php
D sites/all/modules/wmf_civicrm/tests/phpunit/MergeTest.php
M sites/all/modules/wmf_communication/wmf_communication.info
3 files changed, 0 insertions(+), 1,638 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm
refs/changes/59/376459/1
diff --git a/sites/all/modules/wmf_civicrm/tests/phpunit/AddressImportTest.php
b/sites/all/modules/wmf_civicrm/tests/phpunit/AddressImportTest.php
deleted file mode 100644
index 1ed9ccb..000
--- a/sites/all/modules/wmf_civicrm/tests/phpunit/AddressImportTest.php
+++ /dev/null
@@ -1,121 +0,0 @@
-<<< HEAD (764bfe Merge branch 'master' of
https://gerrit.wikimedia.org/r/wiki)
-===
-callAPISuccess('Contact', 'create', array(
- 'first_name' => 'Minnie', 'last_name' => 'Mouse', 'contact_type' =>
'Individual', 'email' => 'min...@mouse.org')
-);
-$this->contactID = $contact['id'];
- }
-
- public function tearDown() {
-CRM_Core_DAO::executeQuery("DELETE FROM civicrm_contact WHERE last_name =
'Mouse'");
- }
-
- /**
- * Test creating an address with void data does not create an address.
- */
- public function testAddressImportVoidData() {
-$msg = array(
- 'currency' => 'USD',
- 'date' => time(),
- 'last_name' => 'Mouse',
- 'email' => 'nob...@wikimedia.org',
- 'gateway' => 'test_gateway',
- 'gateway_txn_id' => mt_rand(),
- 'gross' => '1.23',
- 'payment_method' => 'cc',
- 'street_address' => 'N0NE PROVIDED',
- 'postal_code' => 0,
-);
-
-$contribution = wmf_civicrm_contribution_message_import($msg);
-$addresses = $this->callAPISuccess('Address', 'get', array('contact_id' =>
$contribution['contact_id']));
-$this->assertEquals(0, $addresses['count']);
- }
-
- /**
- * Test creating an address not use void data.
- *
- * @dataProvider getVoidValues
- *
- * @param string $voidValue
- */
- public function testAddressImportSkipVoidData($voidValue) {
-$msg = array(
- 'currency' => 'USD',
- 'date' => time(),
- 'last_name' => 'Mouse',
- 'email' => 'nob...@wikimedia.org',
- 'gateway' => 'test_gateway',
- 'gateway_txn_id' => mt_rand(),
- 'gross' => '1.23',
- 'payment_method' => 'cc',
- 'street_address' => 'really cool place',
- 'postal_code' => $voidValue,
- 'city' => $voidValue,
- 'country' => 'US',
-);
-
-$contribution = wmf_civicrm_contribution_message_import($msg);
-$address = $this->callAPISuccessGetSingle('Address', array('contact_id'
=> $contribution['contact_id']));
-$this->assertTrue(!isset($address['city']));
-$this->assertTrue(!isset($address['postal_code']));
- }
-
- /**
- * Get values which should not be stored to the DB.
- *
- * @return array
- */
- public function getVoidValues() {
-return array(
- array('0'),
- array(0),
- array('NoCity'),
- array('City/Town'),
-);
- }
-
- /**
- * Test creating an address with void data does not create an address.
- *
- * In this case the contact already exists.
- */
- public function testAddressImportVoidDataContactExists() {
-$msg = array(
- 'contact_id' => $this->contactID,
- 'currency' => 'USD',
- 'date' => time(),
- 'last_name' => 'Mouse',
- 'email' => 'nob...@wikimedia.org',
- 'gateway' => 'test_gateway',
- 'gateway_txn_id' => mt_rand(),
- 'gross' => '1.23',
- 'payment_method' => 'cc',
- 'street_address' => 'N0NE PROVIDED',
- 'postal_code' => 0,
-);
-
-$contribution = wmf_civicrm_contribution_message_import($msg);
-$addresses = $this->callAPISuccess('Address', 'get', array('contact_id' =>
$contribution['contact_id']));
-$this->assertEquals(0, $addresses['count']);
- }
-
-}
->>> BRANCH (58f7a3 Submodule commit)
diff --git a/sites/all/modules/wmf_civicrm/tests/phpunit/MergeTest.php
b/sites/all/modules/wmf_civicrm/tests/phpunit/MergeTest.php
deleted file mode 100644
index
[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' of https://gerrit.wikimedia.org/r/wiki...
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/376154 ) Change subject: Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment .. Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment + 3b0d305ff4a43ece2d2fd2c09116ead7f3924af1 Fix third param of watchdog() calls + f1df20a8fb3bb27603c09da557729a93ef14061a Delete 'oneoffs' module + af2c23d877bb04e73d1bbb34d5b2f5fa4cb6b415 Delete wmf_communication\Job stuff + 4d05324b05e0c852b0e396fa5cff26b73dd3cff1 Submodule update for CiviCRM Change-Id: I7296b2bccf5f2822f6c8631b51ca15b0cc5ec866 --- 0 files changed, 0 insertions(+), 0 deletions(-) Approvals: jenkins-bot: Verified Eileen: Looks good to me, approved -- To view, visit https://gerrit.wikimedia.org/r/376154 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7296b2bccf5f2822f6c8631b51ca15b0cc5ec866 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: deployment Gerrit-Owner: Eileen Gerrit-Reviewer: Eileen 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' of https://gerrit.wikimedia.org/r/wiki...
Eileen has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/376154 ) Change subject: Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment .. Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment + 3b0d305ff4a43ece2d2fd2c09116ead7f3924af1 Fix third param of watchdog() calls + f1df20a8fb3bb27603c09da557729a93ef14061a Delete 'oneoffs' module + af2c23d877bb04e73d1bbb34d5b2f5fa4cb6b415 Delete wmf_communication\Job stuff + 4d05324b05e0c852b0e396fa5cff26b73dd3cff1 Submodule update for CiviCRM Change-Id: I7296b2bccf5f2822f6c8631b51ca15b0cc5ec866 --- 0 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm refs/changes/54/376154/1 -- To view, visit https://gerrit.wikimedia.org/r/376154 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7296b2bccf5f2822f6c8631b51ca15b0cc5ec866 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: deployment Gerrit-Owner: Eileen ___ 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' of https://gerrit.wikimedia.org/r/wiki...
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/368111 ) Change subject: Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment .. Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment + e2b0465075bebbd7a2cd5387886f138cffa28a8b Add filters to mailing report. + b5fb091c82d7f1139121fb3dc32526e77206ebfa Omnimailing - extendeded mailing report - add suppressed + d46685d6cb802b59a70dff77500dbd30b4aac2b8 Update Omnimail GET to add rml fields Change-Id: I7064e0798eada407f83afe5857b99e7d683c89f4 --- 0 files changed, 0 insertions(+), 0 deletions(-) Approvals: jenkins-bot: Verified Eileen: Looks good to me, approved -- To view, visit https://gerrit.wikimedia.org/r/368111 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7064e0798eada407f83afe5857b99e7d683c89f4 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: deployment Gerrit-Owner: Eileen Gerrit-Reviewer: Eileen 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' of https://gerrit.wikimedia.org/r/wiki...
Eileen has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/368111 ) Change subject: Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment .. Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment + e2b0465075bebbd7a2cd5387886f138cffa28a8b Add filters to mailing report. + b5fb091c82d7f1139121fb3dc32526e77206ebfa Omnimailing - extendeded mailing report - add suppressed + d46685d6cb802b59a70dff77500dbd30b4aac2b8 Update Omnimail GET to add rml fields Change-Id: I7064e0798eada407f83afe5857b99e7d683c89f4 --- 0 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm refs/changes/11/368111/1 -- To view, visit https://gerrit.wikimedia.org/r/368111 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7064e0798eada407f83afe5857b99e7d683c89f4 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: deployment Gerrit-Owner: Eileen ___ 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' of https://gerrit.wikimedia.org/r/wiki...
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/367611 ) Change subject: Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into up .. Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into up 8ef93f59975df3e36bf9847df875175c9a1960a0 Log more and catch errors on duplicate invoice ID 6cf21b0e5d9130ac8c858ffbaffac7ebd810506c Guard against undefined username/pw d5df1125168b2ee75de3dc1c08071c18481b2d20 Update Silverpopconnector a4ed41cfe615790f553366432cb00eebef6323c0 Submodule update for CiviCRM Change-Id: I0cce7b36b63afcc249e2d2c71182f8c7cf8f5d0b --- 0 files changed, 0 insertions(+), 0 deletions(-) Approvals: jenkins-bot: Verified Eileen: Looks good to me, approved -- To view, visit https://gerrit.wikimedia.org/r/367611 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0cce7b36b63afcc249e2d2c71182f8c7cf8f5d0b Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: deployment Gerrit-Owner: Eileen Gerrit-Reviewer: Eileen 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' of https://gerrit.wikimedia.org/r/wiki...
Eileen has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/367611 ) Change subject: Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into up .. Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into up 8ef93f59975df3e36bf9847df875175c9a1960a0 Log more and catch errors on duplicate invoice ID 6cf21b0e5d9130ac8c858ffbaffac7ebd810506c Guard against undefined username/pw d5df1125168b2ee75de3dc1c08071c18481b2d20 Update Silverpopconnector a4ed41cfe615790f553366432cb00eebef6323c0 Submodule update for CiviCRM Change-Id: I0cce7b36b63afcc249e2d2c71182f8c7cf8f5d0b --- 0 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm refs/changes/11/367611/1 -- To view, visit https://gerrit.wikimedia.org/r/367611 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0cce7b36b63afcc249e2d2c71182f8c7cf8f5d0b Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: deployment Gerrit-Owner: Eileen ___ 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' of https://gerrit.wikimedia.org/r/wiki...
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/367355 ) Change subject: Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment .. Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment 9633e4de9eedaf5d9f009699e3cb2b0d1b863870 Submodule commit for CiviCRM b151a5f Temporary WMF fix on CRM-20905 Bug: T170900 Change-Id: Iac8d3650ba903a4a94acbadb9d28fca8a8fe3f95 --- 0 files changed, 0 insertions(+), 0 deletions(-) Approvals: jenkins-bot: Verified Eileen: Looks good to me, approved -- To view, visit https://gerrit.wikimedia.org/r/367355 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iac8d3650ba903a4a94acbadb9d28fca8a8fe3f95 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: deployment Gerrit-Owner: Eileen Gerrit-Reviewer: Eileen 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' of https://gerrit.wikimedia.org/r/wiki...
Eileen has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/367355 ) Change subject: Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment .. Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment 9633e4de9eedaf5d9f009699e3cb2b0d1b863870 Submodule commit for CiviCRM b151a5f Temporary WMF fix on CRM-20905 Bug: T170900 Change-Id: Iac8d3650ba903a4a94acbadb9d28fca8a8fe3f95 --- 0 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm refs/changes/55/367355/1 -- To view, visit https://gerrit.wikimedia.org/r/367355 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iac8d3650ba903a4a94acbadb9d28fca8a8fe3f95 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: deployment Gerrit-Owner: Eileen ___ 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' of https://gerrit.wikimedia.org/r/wiki...
Eileen has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/366974 ) Change subject: Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment .. Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment 3289733 Change CiviMailing create command to use is_completed 5647648 Resurrecting hashar's original composer json linter Change-Id: I1d0695b0b3816f7612d125213d1183166ddcf5f3 --- 0 files changed, 0 insertions(+), 0 deletions(-) Approvals: jenkins-bot: Verified Eileen: Looks good to me, approved -- To view, visit https://gerrit.wikimedia.org/r/366974 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1d0695b0b3816f7612d125213d1183166ddcf5f3 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: deployment Gerrit-Owner: Eileen Gerrit-Reviewer: Eileen 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' of https://gerrit.wikimedia.org/r/wiki...
Eileen has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/366974 ) Change subject: Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment .. Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment 3289733 Change CiviMailing create command to use is_completed 5647648 Resurrecting hashar's original composer json linter Change-Id: I1d0695b0b3816f7612d125213d1183166ddcf5f3 --- 0 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm refs/changes/74/366974/1 -- To view, visit https://gerrit.wikimedia.org/r/366974 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1d0695b0b3816f7612d125213d1183166ddcf5f3 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: deployment Gerrit-Owner: Eileen ___ 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' of https://gerrit.wikimedia.org/r/wiki...
Eileen has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/365705 ) Change subject: Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment .. Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment CiviCRM submodule update cd5f7a6 Selector pulls receive date instead of thank you date Change-Id: I84d4645e18db704ac1a4ab4928c6e0c69f809338 --- 0 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm refs/changes/05/365705/1 -- To view, visit https://gerrit.wikimedia.org/r/365705 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I84d4645e18db704ac1a4ab4928c6e0c69f809338 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: deployment Gerrit-Owner: Eileen ___ 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' of https://gerrit.wikimedia.org/r/wiki...
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/364619 ) Change subject: Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment .. Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment 1253580 Initial commit, omnimail extension & extendedmailingreport 8a86f99 Add composer-merge-plugin 34cf6cc PHPunit 5.7, not 5.6 7f680ea Update phpunit to use 5.7 a375a01 CurrencyRates template: add SmashPig namespace Change-Id: If6079ab119bd1518b2a531d0ec6e6517f79a68c6 --- D phpunit.xml D sites/all/modules/wmf_communication/tests/phpunit/SilverpopImporterTest.php 2 files changed, 0 insertions(+), 185 deletions(-) Approvals: jenkins-bot: Verified Eileen: Looks good to me, approved diff --git a/phpunit.xml b/phpunit.xml deleted file mode 100644 index 0f6cfbb..000 --- a/phpunit.xml +++ /dev/null @@ -1,47 +0,0 @@ -<<< HEAD (d26886 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/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 (125358 Initial commit, omnimail extension & extendedmailingreport) diff --git a/sites/all/modules/wmf_communication/tests/phpunit/SilverpopImporterTest.php b/sites/all/modules/wmf_communication/tests/phpunit/SilverpopImporterTest.php deleted file mode 100644 index 94b4d36..000 --- a/sites/all/modules/wmf_communication/tests/phpunit/SilverpopImporterTest.php +++ /dev/null @@ -1,138 +0,0 @@ -<<< HEAD (d26886 Merge branch 'master' into deployment) -=== -getMockBuilder( 'Net_SFTP' ) - ->disableOriginalConstructor() - ->setMethods( array( 'login', 'get', 'disconnect' ) ) - ->getMock(); - $mailStore = $this->createMock( 'wmf_communication\CiviMailBulkStore'); - $zipper = $this->createMock( 'ZipArchive'); - $mailing = $this->createMock( 'wmf_communication\ICiviMailingRecord'); - - $tempDir = file_directory_temp(); - - $sftp->expects( $this->atLeastOnce() ) - ->method( 'login' ) - ->with( 'TestUser', 'TestPass' ) - ->will( $this->returnValue( true ) ); - - $sftp->expects( $this->once() ) - ->method( 'get' ) - ->with( 'download/Raw Recipient Data Export Sep 02 2014 18-45-05 PM 1200.zip', - "$tempDir/Raw Recipient Data Export Sep 02 2014 18-45-05 PM 1200.zip" ) - ->will( $this->returnValue( true ) ); - - $zipper->expects( $this->once() ) - ->method( 'open' ) - ->with( "$tempDir/Raw Recipient Data Export Sep 02 2014 18-45-05 PM 1200.zip" ) - ->will( $this->returnValue( true ) ); - - $zipper->expects( $this->once() ) - ->method( 'extractTo' ) - ->with( $tempDir ) - ->will( $this->returnValue( true ) ); - - $mailStore->expects( $this->once() ) - ->method( 'getMailing' ) - ->with( 'Silverpop', '9876543' ) - ->will( $this->ThrowException( new CiviMailingMissingException() ) ); - - $mailStore->expects( $this->once() ) - ->method( 'addMailing' ) - ->with( 'Silverpop', '9876543', $this->anything(), 'Test Subject', 0, 'RUNNING' ) - ->will( $this->returnValue( $mailing ) ); - - $emails = array(); - $fileContents = "Recipient Id,Recipient Type,Mailing Id,Report Id,Campaign Id,Email,Event Type,Event Timestamp,Body Type,Content Id,Click Name,URL,
[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' of https://gerrit.wikimedia.org/r/wiki...
Eileen has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/364619 ) Change subject: Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment .. Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment 1253580 Initial commit, omnimail extension & extendedmailingreport 8a86f99 Add composer-merge-plugin 34cf6cc PHPunit 5.7, not 5.6 7f680ea Update phpunit to use 5.7 a375a01 CurrencyRates template: add SmashPig namespace Change-Id: If6079ab119bd1518b2a531d0ec6e6517f79a68c6 --- D phpunit.xml D sites/all/modules/wmf_communication/tests/phpunit/SilverpopImporterTest.php 2 files changed, 0 insertions(+), 185 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm refs/changes/19/364619/1 diff --git a/phpunit.xml b/phpunit.xml deleted file mode 100644 index 0f6cfbb..000 --- a/phpunit.xml +++ /dev/null @@ -1,47 +0,0 @@ -<<< HEAD (d26886 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/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 (125358 Initial commit, omnimail extension & extendedmailingreport) diff --git a/sites/all/modules/wmf_communication/tests/phpunit/SilverpopImporterTest.php b/sites/all/modules/wmf_communication/tests/phpunit/SilverpopImporterTest.php deleted file mode 100644 index 94b4d36..000 --- a/sites/all/modules/wmf_communication/tests/phpunit/SilverpopImporterTest.php +++ /dev/null @@ -1,138 +0,0 @@ -<<< HEAD (d26886 Merge branch 'master' into deployment) -=== -getMockBuilder( 'Net_SFTP' ) - ->disableOriginalConstructor() - ->setMethods( array( 'login', 'get', 'disconnect' ) ) - ->getMock(); - $mailStore = $this->createMock( 'wmf_communication\CiviMailBulkStore'); - $zipper = $this->createMock( 'ZipArchive'); - $mailing = $this->createMock( 'wmf_communication\ICiviMailingRecord'); - - $tempDir = file_directory_temp(); - - $sftp->expects( $this->atLeastOnce() ) - ->method( 'login' ) - ->with( 'TestUser', 'TestPass' ) - ->will( $this->returnValue( true ) ); - - $sftp->expects( $this->once() ) - ->method( 'get' ) - ->with( 'download/Raw Recipient Data Export Sep 02 2014 18-45-05 PM 1200.zip', - "$tempDir/Raw Recipient Data Export Sep 02 2014 18-45-05 PM 1200.zip" ) - ->will( $this->returnValue( true ) ); - - $zipper->expects( $this->once() ) - ->method( 'open' ) - ->with( "$tempDir/Raw Recipient Data Export Sep 02 2014 18-45-05 PM 1200.zip" ) - ->will( $this->returnValue( true ) ); - - $zipper->expects( $this->once() ) - ->method( 'extractTo' ) - ->with( $tempDir ) - ->will( $this->returnValue( true ) ); - - $mailStore->expects( $this->once() ) - ->method( 'getMailing' ) - ->with( 'Silverpop', '9876543' ) - ->will( $this->ThrowException( new CiviMailingMissingException() ) ); - - $mailStore->expects( $this->once() ) - ->method( 'addMailing' ) - ->with( 'Silverpop', '9876543', $this->anything(), 'Test Subject', 0, 'RUNNING' ) - ->will( $this->returnValue( $mailing ) ); - - $emails = array(); - $fileContents = "Recipient Id,Recipient Type,Mailing Id,Report Id,Campaign Id,Email,Event Type,Event Timestamp,Body Type,Content Id,Click
[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' of https://gerrit.wikimedia.org/r/wiki...
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/363503 ) Change subject: Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment .. Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment 71687af Update trigger scripts to relect 4.7.21 update Change-Id: If0be153255de0a846acf5a769570e25b71a9a236 --- 0 files changed, 0 insertions(+), 0 deletions(-) Approvals: jenkins-bot: Verified Eileen: Looks good to me, approved -- To view, visit https://gerrit.wikimedia.org/r/363503 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If0be153255de0a846acf5a769570e25b71a9a236 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: deployment Gerrit-Owner: Eileen Gerrit-Reviewer: Eileen 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' of https://gerrit.wikimedia.org/r/wiki...
Eileen has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/363503 ) Change subject: Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment .. Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment 71687af Update trigger scripts to relect 4.7.21 update Change-Id: If0be153255de0a846acf5a769570e25b71a9a236 --- 0 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm refs/changes/03/363503/1 -- To view, visit https://gerrit.wikimedia.org/r/363503 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If0be153255de0a846acf5a769570e25b71a9a236 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: deployment Gerrit-Owner: Eileen ___ 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' of https://gerrit.wikimedia.org/r/wiki...
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/363489 ) Change subject: Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment .. Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment CiviCRM upgrade related submodule update Change-Id: I7cae90069837b1324fcd7a194f2171b07ce496ab --- 0 files changed, 0 insertions(+), 0 deletions(-) Approvals: jenkins-bot: Verified Eileen: Looks good to me, approved -- To view, visit https://gerrit.wikimedia.org/r/363489 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7cae90069837b1324fcd7a194f2171b07ce496ab Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: deployment Gerrit-Owner: Eileen Gerrit-Reviewer: Eileen 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' of https://gerrit.wikimedia.org/r/wiki...
Eileen has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/363489 ) Change subject: Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment .. Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment CiviCRM upgrade related submodule update Change-Id: I7cae90069837b1324fcd7a194f2171b07ce496ab --- 0 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm refs/changes/89/363489/1 -- To view, visit https://gerrit.wikimedia.org/r/363489 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7cae90069837b1324fcd7a194f2171b07ce496ab Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: deployment Gerrit-Owner: Eileen ___ 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' of https://gerrit.wikimedia.org/r/wiki...
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/363423 ) Change subject: Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment .. Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment f088f6e Submodule udpate upgrade CiviCRM to 4.7.21 Change-Id: I8cd5cc60dd82272d34a267e247396bbd8a1c3b68 --- 0 files changed, 0 insertions(+), 0 deletions(-) Approvals: jenkins-bot: Verified Eileen: Looks good to me, approved -- To view, visit https://gerrit.wikimedia.org/r/363423 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8cd5cc60dd82272d34a267e247396bbd8a1c3b68 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: deployment Gerrit-Owner: Eileen Gerrit-Reviewer: Eileen 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' of https://gerrit.wikimedia.org/r/wiki...
Eileen has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/363423 ) Change subject: Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment .. Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment f088f6e Submodule udpate upgrade CiviCRM to 4.7.21 Change-Id: I8cd5cc60dd82272d34a267e247396bbd8a1c3b68 --- 0 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm refs/changes/23/363423/1 -- To view, visit https://gerrit.wikimedia.org/r/363423 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8cd5cc60dd82272d34a267e247396bbd8a1c3b68 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: deployment Gerrit-Owner: Eileen ___ 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' of https://gerrit.wikimedia.org/r/wiki...
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/363290 )
Change subject: Merge branch 'master' of
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
..
Merge branch 'master' of
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
263222b3ff300711cb3fb2eb164529a5b46bff0c Test tidy ups, ensure data from
failed run doesn not break test
c8eaf54055cf16983b1ac55e26b25a096eed6d8d Remove further instance of class_api
in favour of civicrm_api3
ec413e77b1420c6894642c15d316aca33cc72625 Stop calling deprecated function.
c3eecf3aed0b672b4a429af5b3338975545c2d3d Remove deprecated function call from
unit test.
44894d6cc4e6d875abc92cfa07c437cfcf84d88e Enable CiviCampaign.
3676cf5ddfedeb17c06fdb86219d0514758cbeb9 Specify output directory for
make-exchange-refs
48baba94e0b087eb32a61247440b4afb9d455d0d $correlationId -> $logId
02955c188a62ff110cd09e9ea62662e62b32425c CiviCRM Submodule update 9e4899f
CRM-20778 - Use civicontribute permission for contribution recur.cancel 5781882
CiviCRM composer update.
c4adb98c4309063a5e1d3ad4945ff4f2056983c8 Add index to civicrm_campaign.name
Change-Id: I0026fbe243c33b8ceb6c96c845d0ef93b082991d
---
D sites/all/modules/large_donation/tests/LargeDonationTest.php
D sites/all/modules/offline2civicrm/tests/ForeignChecksFileTest.php
D sites/all/modules/offline2civicrm/tests/includes/BaseChecksFileTest.php
D sites/all/modules/queue2civicrm/tests/data/payments-antifraud.json
D sites/all/modules/queue2civicrm/tests/includes/Message.php
D sites/all/modules/wmf_civicrm/tests/phpunit/PhoneImportTest.php
D sites/all/modules/wmf_communication/tests/phpunit/CiviMailBulkTest.php
7 files changed, 0 insertions(+), 574 deletions(-)
Approvals:
jenkins-bot: Verified
Eileen: Looks good to me, approved
diff --git a/sites/all/modules/large_donation/tests/LargeDonationTest.php
b/sites/all/modules/large_donation/tests/LargeDonationTest.php
deleted file mode 100644
index 72f4b15..000
--- a/sites/all/modules/large_donation/tests/LargeDonationTest.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<<< HEAD (e53d62 CiviCRM Submodule update 9e4899f CRM-20778 - Use
civicontrib)
-===
-threshold = 100;
-
-db_delete( 'large_donation_notification' )
-->execute();
-
-db_insert( 'large_donation_notification' )
-->fields( array(
-'addressee' => 'noti...@localhost.net',
-'threshold' => $this->threshold,
-) )
-->execute();
-
-$result = $this->callAPISuccess('Contact', 'create', array(
-'contact_type' => 'Individual',
-'first_name' => 'Testes',
-));
-$this->contact_id = $result['id'];
-}
-
-function tearDown() {
-db_delete( 'large_donation_notification' )
-->execute();
-
-parent::tearDown();
-}
-
-function testUnderThreshold() {
-$result = civicrm_api3( 'Contribution', 'create', array(
-'contact_id' => $this->contact_id,
-'contribution_type' => 'Cash',
-'currency' => 'USD',
-'payment_instrument' => 'Credit Card',
-'total_amount' => $this->threshold - 0.01,
-'trxn_id' => 'TEST_GATEWAY ' . mt_rand(),
-) );
-
-$this->assertEquals( 0, TestMailer::countMailings() );
-}
-
-function testAboveThreshold() {
-$amount = $this->threshold + 0.01;
-$this->callAPISuccess('Contribution', 'create', array(
-'contact_id' => $this->contact_id,
-'contribution_type' => 'Cash',
-'currency' => 'USD',
-'payment_instrument' => 'Credit Card',
-'total_amount' => $amount,
-'trxn_id' => 'TEST_GATEWAY ' . mt_rand(),
-'source' => 'EUR 2020',
-) );
-
-$this->assertEquals( 1, TestMailer::countMailings() );
-
-$mailing = TestMailer::getMailing( 0 );
-$this->assertEquals( 1, preg_match( "/{$amount}/", $mailing['html'] ),
-'Found amount in the notification email body.' );
-}
-}
->>> BRANCH (c4adb9 Add index to civicrm_campaign.name)
diff --git a/sites/all/modules/offline2civicrm/tests/ForeignChecksFileTest.php
b/sites/all/modules/offline2civicrm/tests/ForeignChecksFileTest.php
deleted file mode 100644
index f8ca11c..000
--- a/sites/all/modules/offline2civicrm/tests/ForeignChecksFileTest.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<<< HEAD (e53d62 CiviCRM Submodule update 9e4899f CRM-20778 - Use
civicontrib)
-===
-epochtime = wmf_common_date_parse_string('2017-02-28');
-$this->setExchangeRates($this->epochtime, array('USD' => 1, 'GBP' =>
2));
-
-require_once __DIR__ . "/includes/ForeignChecksFileProbe.php";
-}
-
-function testParseRow() {
-$data = array(
-'Batch Number' => '1234',
-'Origin
[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' of https://gerrit.wikimedia.org/r/wiki...
Eileen has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/363290 )
Change subject: Merge branch 'master' of
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
..
Merge branch 'master' of
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
263222b3ff300711cb3fb2eb164529a5b46bff0c Test tidy ups, ensure data from
failed run doesn not break test
c8eaf54055cf16983b1ac55e26b25a096eed6d8d Remove further instance of class_api
in favour of civicrm_api3
ec413e77b1420c6894642c15d316aca33cc72625 Stop calling deprecated function.
c3eecf3aed0b672b4a429af5b3338975545c2d3d Remove deprecated function call from
unit test.
44894d6cc4e6d875abc92cfa07c437cfcf84d88e Enable CiviCampaign.
3676cf5ddfedeb17c06fdb86219d0514758cbeb9 Specify output directory for
make-exchange-refs
48baba94e0b087eb32a61247440b4afb9d455d0d $correlationId -> $logId
02955c188a62ff110cd09e9ea62662e62b32425c CiviCRM Submodule update 9e4899f
CRM-20778 - Use civicontribute permission for contribution recur.cancel 5781882
CiviCRM composer update.
c4adb98c4309063a5e1d3ad4945ff4f2056983c8 Add index to civicrm_campaign.name
Change-Id: I0026fbe243c33b8ceb6c96c845d0ef93b082991d
---
D sites/all/modules/large_donation/tests/LargeDonationTest.php
D sites/all/modules/offline2civicrm/tests/ForeignChecksFileTest.php
D sites/all/modules/offline2civicrm/tests/includes/BaseChecksFileTest.php
D sites/all/modules/queue2civicrm/tests/data/payments-antifraud.json
D sites/all/modules/queue2civicrm/tests/includes/Message.php
D sites/all/modules/wmf_civicrm/tests/phpunit/PhoneImportTest.php
D sites/all/modules/wmf_communication/tests/phpunit/CiviMailBulkTest.php
7 files changed, 0 insertions(+), 574 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm
refs/changes/90/363290/1
diff --git a/sites/all/modules/large_donation/tests/LargeDonationTest.php
b/sites/all/modules/large_donation/tests/LargeDonationTest.php
deleted file mode 100644
index 72f4b15..000
--- a/sites/all/modules/large_donation/tests/LargeDonationTest.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<<< HEAD (e53d62 CiviCRM Submodule update 9e4899f CRM-20778 - Use
civicontrib)
-===
-threshold = 100;
-
-db_delete( 'large_donation_notification' )
-->execute();
-
-db_insert( 'large_donation_notification' )
-->fields( array(
-'addressee' => 'noti...@localhost.net',
-'threshold' => $this->threshold,
-) )
-->execute();
-
-$result = $this->callAPISuccess('Contact', 'create', array(
-'contact_type' => 'Individual',
-'first_name' => 'Testes',
-));
-$this->contact_id = $result['id'];
-}
-
-function tearDown() {
-db_delete( 'large_donation_notification' )
-->execute();
-
-parent::tearDown();
-}
-
-function testUnderThreshold() {
-$result = civicrm_api3( 'Contribution', 'create', array(
-'contact_id' => $this->contact_id,
-'contribution_type' => 'Cash',
-'currency' => 'USD',
-'payment_instrument' => 'Credit Card',
-'total_amount' => $this->threshold - 0.01,
-'trxn_id' => 'TEST_GATEWAY ' . mt_rand(),
-) );
-
-$this->assertEquals( 0, TestMailer::countMailings() );
-}
-
-function testAboveThreshold() {
-$amount = $this->threshold + 0.01;
-$this->callAPISuccess('Contribution', 'create', array(
-'contact_id' => $this->contact_id,
-'contribution_type' => 'Cash',
-'currency' => 'USD',
-'payment_instrument' => 'Credit Card',
-'total_amount' => $amount,
-'trxn_id' => 'TEST_GATEWAY ' . mt_rand(),
-'source' => 'EUR 2020',
-) );
-
-$this->assertEquals( 1, TestMailer::countMailings() );
-
-$mailing = TestMailer::getMailing( 0 );
-$this->assertEquals( 1, preg_match( "/{$amount}/", $mailing['html'] ),
-'Found amount in the notification email body.' );
-}
-}
->>> BRANCH (c4adb9 Add index to civicrm_campaign.name)
diff --git a/sites/all/modules/offline2civicrm/tests/ForeignChecksFileTest.php
b/sites/all/modules/offline2civicrm/tests/ForeignChecksFileTest.php
deleted file mode 100644
index f8ca11c..000
--- a/sites/all/modules/offline2civicrm/tests/ForeignChecksFileTest.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<<< HEAD (e53d62 CiviCRM Submodule update 9e4899f CRM-20778 - Use
civicontrib)
-===
-epochtime = wmf_common_date_parse_string('2017-02-28');
-$this->setExchangeRates($this->epochtime, array('USD' => 1, 'GBP' =>
2));
-
-require_once __DIR__ . "/includes/ForeignChecksFileProbe.php";
-}
-
-function testParseRow() {
-$data = array(
-'Batch Number' => '1234',
-
[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' of https://gerrit.wikimedia.org/r/wiki...
Eileen has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/343794 )
Change subject: Merge branch 'master' of
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
..
Merge branch 'master' of
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
+ 621b8a3ec5dced52f7508aa0ba6533475a91d07d Test more fields on donation import
+ c7dd645250b9f13e0751ba82f4a9b1d956bc77da Detect normalized paypal messages in
queue consumer
+ f8929c246838230242dbd5cae6836206e4d6af64 Split out queue tests
+ 2e50c1fdc67534ea10876c18fdc92be44d7ce76d Attempt to get a few more blanked
addresses.
Change-Id: Ibb6c09e2b9b101ad050efe3b51e00ea879d8e4d4
---
D sites/all/modules/queue2civicrm/tests/includes/Message.php
D sites/all/modules/queue2civicrm/tests/phpunit/DonationQueueTest.php
D sites/all/modules/queue2civicrm/tests/phpunit/RecurringQueueTest.php
D sites/all/modules/queue2civicrm/tests/phpunit/RefundQueueTest.php
4 files changed, 0 insertions(+), 901 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm
refs/changes/94/343794/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 9e931e1..000
--- a/sites/all/modules/queue2civicrm/tests/includes/Message.php
+++ /dev/null
@@ -1,199 +0,0 @@
-<<< HEAD (e058e8 Merge branch 'master' into deployment)
-===
-data = $this->defaults;
-$this->headers = array();
-$this->set( $values );
-}
-
-function set( $values ) {
-if ( is_array( $values ) ) {
-$this->data = $values + $this->data;
-}
-
-$this->body = json_encode( $this->data );
-}
-
-function setHeaders( $values ) {
-if ( is_array( $values ) ) {
-$this->headers = array_merge( $this->headers, $values );
-}
-}
-
-function getBody() {
-return $this->data;
-}
-
-function getHeaders() {
-return $this->headers;
-}
-
-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" );
-
-parent::__construct( array(
-$this->txn_id_key => mt_rand(),
-'order_id' => mt_rand(),
-) + $values );
-
-$this->setHeaders( array(
-"persistent" => 'true',
-// FIXME: this might indicate a key error in our application code.
-"correlation-id" =>
"{$this->data['gateway']}-{$this->data[$this->txn_id_key]}",
-"JMSCorrelationID" =>
"{$this->data['gateway']}-{$this->data[$this->txn_id_key]}",
-) );
-}
-
-function getGateway() {
-return $this->data['gateway'];
-}
-
-function getGatewayTxnId() {
-return $this->data[$this->txn_id_key];
-}
-
-function get( $key ) {
-return $this->data
[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' of https://gerrit.wikimedia.org/r/wiki...
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/342972 )
Change subject: Merge branch 'master' of
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
..
Merge branch 'master' of
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
37a79fc Benevity loosening, handle multiple contact use in the past.
Change-Id: I8c901e31156d47236fa395fa61008cd2b2379285
---
D sites/all/modules/offline2civicrm/tests/BenevityTest.php
1 file changed, 0 insertions(+), 627 deletions(-)
Approvals:
jenkins-bot: Verified
Eileen: Looks good to me, approved
diff --git a/sites/all/modules/offline2civicrm/tests/BenevityTest.php
b/sites/all/modules/offline2civicrm/tests/BenevityTest.php
deleted file mode 100644
index e0a74d5..000
--- a/sites/all/modules/offline2civicrm/tests/BenevityTest.php
+++ /dev/null
@@ -1,627 +0,0 @@
-<<< HEAD (f1a3d6 Merge branch 'master' of
https://gerrit.wikimedia.org/r/wiki)
-===
-https://phabricator.wikimedia.org/T115044#3012232
- */
-class BenevityTest extends BaseChecksFileTest {
- protected $epochtime;
-
- function setUp() {
-parent::setUp();
-
-$this->epochtime = wmf_common_date_parse_string('2016-09-15');
-$this->setExchangeRates($this->epochtime, array('USD' => 1, 'BTC' => 3));
-$this->gateway = 'benevity';
-civicrm_initialize();
-CRM_Core_DAO::executeQuery("
- DELETE FROM civicrm_contribution
- WHERE trxn_id LIKE 'BENEVITY%'
-");
-CRM_Core_DAO::executeQuery("
- DELETE FROM civicrm_contact
- WHERE organization_name IN('Donald Duck Inc', 'Mickey Mouse Inc', 'Goofy
Inc', 'Uncle Scrooge Inc')
- OR nick_name IN('Donald Duck Inc', 'Mickey Mouse Inc', 'Goofy Inc',
'Uncle Scrooge Inc')
- OR first_name = 'Minnie' AND last_name = 'Mouse'
- OR first_name = 'Pluto'
-");
-$this->ensureAnonymousContactExists();
-\Civi::$statics = array();
-$countries = $this->callAPISuccess('Country', 'get', array());
-$this->callAPISuccess('Setting', 'create', array('countryLimit' =>
array_keys($countries['values'])));
-
- }
-
- /**
- * Make sure we have the anonymous contact - like the live DB.
- */
- protected function ensureAnonymousContactExists() {
-$anonymousParams = array(
- 'first_name' => 'Anonymous',
- 'last_name' => 'Anonymous',
- 'email' => 'fakeem...@wikimedia.org',
- 'contact_type' => 'Individual',
-);
-$contacts = $this->callAPISuccess('Contact', 'get', $anonymousParams);
-if ($contacts['count'] == 0) {
- $this->callAPISuccess('Contact', 'create', $anonymousParams);
-}
-$contacts = $this->callAPISuccess('Contact', 'get', $anonymousParams);
-$this->assertEquals(1, $contacts['count']);
- }
-
- /**
- * Test that all imports fail if the organization has multiple matches.
- */
- function testImportFailOrganizationContactAmbiguous() {
-$this->callAPISuccess('Contact', 'create', array('organization_name' =>
'Donald Duck Inc', 'contact_type' => 'Organization'));
-$this->callAPISuccess('Contact', 'create', array('organization_name' =>
'Donald Duck Inc', 'contact_type' => 'Organization'));
-$importer = new BenevityFile( __DIR__ . "/data/benevity.csv" );
-$importer->import();
-$messages = $importer->getMessages();
-$this->assertEquals('0 out of 4 rows were imported.', $messages['Result']);
- }
-
- /**
- * Test that all imports fail if the organization does not pre-exist.
- */
- function testImportFailNoOrganizationContactExists() {
-$importer = new BenevityFile( __DIR__ . "/data/benevity.csv" );
-$importer->import();
-$messages = $importer->getMessages();
-$this->assertEquals('0 out of 4 rows were imported.', $messages['Result']);
- }
-
- /**
- * Test that import passes for the contact if a single match is found.
- */
- function testImportSucceedOrganizationSingleContactExists() {
-$this->callAPISuccess('Contact', 'create', array('organization_name' =>
'Donald Duck Inc', 'contact_type' => 'Organization'));
-$importer = new BenevityFile( __DIR__ . "/data/benevity.csv" );
-$importer->import();
-$messages = $importer->getMessages();
-$this->assertEquals('1 out of 4 rows were imported.', $messages['Result']);
- }
-
- /**
- * Test that import passes for the Individual contact if a single match is
found.
- */
- function testImportSucceedIndividualSingleContactExists() {
-$thaMouseMeister = $this->callAPISuccess('Contact', 'create',
array('organization_name' => 'Mickey Mouse Inc', 'contact_type' =>
'Organization'));
-$minnie = $this->callAPISuccess('Contact', 'create', array(
- 'first_name' => 'Minnie', 'last_name' => 'Mouse', 'contact_type' =>
'Individual', 'email' => 'min...@mouse.org',
-));
-$importer = new BenevityFile( __DIR__ . "/data/benevity.csv" );
-$importer->import();
-$mess
[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' of https://gerrit.wikimedia.org/r/wiki...
Eileen has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/342972 )
Change subject: Merge branch 'master' of
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
..
Merge branch 'master' of
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
37a79fc Benevity loosening, handle multiple contact use in the past.
Change-Id: I8c901e31156d47236fa395fa61008cd2b2379285
---
D sites/all/modules/offline2civicrm/tests/BenevityTest.php
1 file changed, 0 insertions(+), 627 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm
refs/changes/72/342972/1
diff --git a/sites/all/modules/offline2civicrm/tests/BenevityTest.php
b/sites/all/modules/offline2civicrm/tests/BenevityTest.php
deleted file mode 100644
index e0a74d5..000
--- a/sites/all/modules/offline2civicrm/tests/BenevityTest.php
+++ /dev/null
@@ -1,627 +0,0 @@
-<<< HEAD (f1a3d6 Merge branch 'master' of
https://gerrit.wikimedia.org/r/wiki)
-===
-https://phabricator.wikimedia.org/T115044#3012232
- */
-class BenevityTest extends BaseChecksFileTest {
- protected $epochtime;
-
- function setUp() {
-parent::setUp();
-
-$this->epochtime = wmf_common_date_parse_string('2016-09-15');
-$this->setExchangeRates($this->epochtime, array('USD' => 1, 'BTC' => 3));
-$this->gateway = 'benevity';
-civicrm_initialize();
-CRM_Core_DAO::executeQuery("
- DELETE FROM civicrm_contribution
- WHERE trxn_id LIKE 'BENEVITY%'
-");
-CRM_Core_DAO::executeQuery("
- DELETE FROM civicrm_contact
- WHERE organization_name IN('Donald Duck Inc', 'Mickey Mouse Inc', 'Goofy
Inc', 'Uncle Scrooge Inc')
- OR nick_name IN('Donald Duck Inc', 'Mickey Mouse Inc', 'Goofy Inc',
'Uncle Scrooge Inc')
- OR first_name = 'Minnie' AND last_name = 'Mouse'
- OR first_name = 'Pluto'
-");
-$this->ensureAnonymousContactExists();
-\Civi::$statics = array();
-$countries = $this->callAPISuccess('Country', 'get', array());
-$this->callAPISuccess('Setting', 'create', array('countryLimit' =>
array_keys($countries['values'])));
-
- }
-
- /**
- * Make sure we have the anonymous contact - like the live DB.
- */
- protected function ensureAnonymousContactExists() {
-$anonymousParams = array(
- 'first_name' => 'Anonymous',
- 'last_name' => 'Anonymous',
- 'email' => 'fakeem...@wikimedia.org',
- 'contact_type' => 'Individual',
-);
-$contacts = $this->callAPISuccess('Contact', 'get', $anonymousParams);
-if ($contacts['count'] == 0) {
- $this->callAPISuccess('Contact', 'create', $anonymousParams);
-}
-$contacts = $this->callAPISuccess('Contact', 'get', $anonymousParams);
-$this->assertEquals(1, $contacts['count']);
- }
-
- /**
- * Test that all imports fail if the organization has multiple matches.
- */
- function testImportFailOrganizationContactAmbiguous() {
-$this->callAPISuccess('Contact', 'create', array('organization_name' =>
'Donald Duck Inc', 'contact_type' => 'Organization'));
-$this->callAPISuccess('Contact', 'create', array('organization_name' =>
'Donald Duck Inc', 'contact_type' => 'Organization'));
-$importer = new BenevityFile( __DIR__ . "/data/benevity.csv" );
-$importer->import();
-$messages = $importer->getMessages();
-$this->assertEquals('0 out of 4 rows were imported.', $messages['Result']);
- }
-
- /**
- * Test that all imports fail if the organization does not pre-exist.
- */
- function testImportFailNoOrganizationContactExists() {
-$importer = new BenevityFile( __DIR__ . "/data/benevity.csv" );
-$importer->import();
-$messages = $importer->getMessages();
-$this->assertEquals('0 out of 4 rows were imported.', $messages['Result']);
- }
-
- /**
- * Test that import passes for the contact if a single match is found.
- */
- function testImportSucceedOrganizationSingleContactExists() {
-$this->callAPISuccess('Contact', 'create', array('organization_name' =>
'Donald Duck Inc', 'contact_type' => 'Organization'));
-$importer = new BenevityFile( __DIR__ . "/data/benevity.csv" );
-$importer->import();
-$messages = $importer->getMessages();
-$this->assertEquals('1 out of 4 rows were imported.', $messages['Result']);
- }
-
- /**
- * Test that import passes for the Individual contact if a single match is
found.
- */
- function testImportSucceedIndividualSingleContactExists() {
-$thaMouseMeister = $this->callAPISuccess('Contact', 'create',
array('organization_name' => 'Mickey Mouse Inc', 'contact_type' =>
'Organization'));
-$minnie = $this->callAPISuccess('Contact', 'create', array(
- 'first_name' => 'Minnie', 'last_name' => 'Mouse', 'contact_type' =>
'Individual', 'email' => 'min...@mouse.org',
-));
-$importer = new BenevityFile( __DIR__ . "/data/benevity.csv" );
-$importer->import();
[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' of https://gerrit.wikimedia.org/r/wiki...
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/342943 )
Change subject: Merge branch 'master' of
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
..
Merge branch 'master' of
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
62ce3ad Restore blanked addresses overwritten on merge.
Change-Id: Id9da9e1e2ebd9ac5d3f6af5da04333628e623b53
---
D sites/all/modules/wmf_civicrm/tests/phpunit/MergeTest.php
1 file changed, 0 insertions(+), 1,375 deletions(-)
Approvals:
jenkins-bot: Verified
Eileen: Looks good to me, approved
diff --git a/sites/all/modules/wmf_civicrm/tests/phpunit/MergeTest.php
b/sites/all/modules/wmf_civicrm/tests/phpunit/MergeTest.php
deleted file mode 100644
index 641fc83..000
--- a/sites/all/modules/wmf_civicrm/tests/phpunit/MergeTest.php
+++ /dev/null
@@ -1,1375 +0,0 @@
-<<< HEAD (639eb6 Merge branch 'master' of
https://gerrit.wikimedia.org/r/wiki)
-===
-imitateAdminUser();
-$this->doDuckHunt();
-// Run through the merge first to make sure there aren't pre-existing
contacts in the DB
-// that will ruin the tests.
-$this->callAPISuccess('Job', 'process_batch_merge', array('mode' =>
'safe'));
-
-$this->contactID =
$this->breedDuck(array(wmf_civicrm_get_custom_field_name('do_not_solicit') =>
0));
-$this->contactID2 =
$this->breedDuck(array(wmf_civicrm_get_custom_field_name('do_not_solicit') =>
1));
- }
-
- public function tearDown() {
-$this->callAPISuccess('Contribution', 'get', array(
- 'contact_id' => array('IN' => array($this->contactID,
$this->contactID2)),
- 'api.Contribution.delete' => 1,
-));
-$this->callAPISuccess('Contact', 'delete', array('id' =>
$this->contactID));
-$this->callAPISuccess('Contact', 'delete', array('id' =>
$this->contactID2));
-parent::tearDown();
- }
-
- /**
- * Test that the merge hook causes our custom fields to not be treated as
conflicts.
- *
- * We also need to check the custom data fields afterwards.
- */
- public function testMergeHook() {
-$this->callAPISuccess('Contribution', 'create', array(
- 'contact_id' => $this->contactID,
- 'financial_type_id' => 'Cash',
- 'total_amount' => 10,
- 'currency' => 'USD',
- // Should cause 'is_2014 to be true.
- 'receive_date' => '2014-08-04',
- wmf_civicrm_get_custom_field_name('original_currency') => 'NZD',
- wmf_civicrm_get_custom_field_name('original_amount') => 8,
-));
-$this->callAPISuccess('Contribution', 'create', array(
- 'contact_id' => $this->contactID2,
- 'financial_type_id' => 'Cash',
- 'total_amount' => 5,
- 'currency' => 'USD',
- // Should cause 'is_2012_donor to be true.
- 'receive_date' => '2013-01-04',
-));
-$this->callAPISuccess('Contribution', 'create', array(
- 'contact_id' => $this->contactID2,
- 'financial_type_id' => 'Cash',
- 'total_amount' => 9,
- 'currency' => 'NZD',
- // Should cause 'is_2015_donor to be true.
- 'receive_date' => '2016-04-04',
-));
-$contact = $this->callAPISuccess('Contact', 'get', array(
- 'id' => $this->contactID,
- 'sequential' => 1,
- 'return' =>
array(wmf_civicrm_get_custom_field_name('lifetime_usd_total'),
wmf_civicrm_get_custom_field_name('do_not_solicit')),
-));
-$this->assertEquals(10,
$contact['values'][0][wmf_civicrm_get_custom_field_name('lifetime_usd_total')]);
-$result = $this->callAPISuccess('Job', 'process_batch_merge', array(
- 'criteria' => array('contact' => array('id' => array('IN' =>
array($this->contactID, $this->contactID2,
-));
-$this->assertEquals(1, count($result['values']['merged']));
-$contact = $this->callAPISuccess('Contact', 'get', array(
- 'id' => $this->contactID,
- 'sequential' => 1,
- 'return' => array(
-wmf_civicrm_get_custom_field_name('lifetime_usd_total'),
-wmf_civicrm_get_custom_field_name('do_not_solicit'),
-wmf_civicrm_get_custom_field_name('last_donation_amount'),
-wmf_civicrm_get_custom_field_name('last_donation_currency'),
-wmf_civicrm_get_custom_field_name('last_donation_usd'),
-wmf_civicrm_get_custom_field_name('last_donation_date'),
-wmf_civicrm_get_custom_field_name('is_2011_donor'),
-wmf_civicrm_get_custom_field_name('is_2012_donor'),
-wmf_civicrm_get_custom_field_name('is_2013_donor'),
-wmf_civicrm_get_custom_field_name('is_2014_donor'),
-wmf_civicrm_get_custom_field_name('is_2015_donor'),
-wmf_civicrm_get_custom_field_name('is_2016_donor'),
- ),
-));
-$this->assertEquals(24,
$contact['values'][0][wmf_civicrm_get_custom_field_name('lifetime_usd_total')]);
-$this->assertEquals(1,
$contact['values'][0][wmf_civicrm_get_custom_field_name('do_not_solicit')]);
-$this->as
[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' of https://gerrit.wikimedia.org/r/wiki...
Eileen has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/342943 )
Change subject: Merge branch 'master' of
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
..
Merge branch 'master' of
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
62ce3ad Restore blanked addresses overwritten on merge.
Change-Id: Id9da9e1e2ebd9ac5d3f6af5da04333628e623b53
---
D sites/all/modules/wmf_civicrm/tests/phpunit/MergeTest.php
1 file changed, 0 insertions(+), 1,375 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm
refs/changes/43/342943/1
diff --git a/sites/all/modules/wmf_civicrm/tests/phpunit/MergeTest.php
b/sites/all/modules/wmf_civicrm/tests/phpunit/MergeTest.php
deleted file mode 100644
index 641fc83..000
--- a/sites/all/modules/wmf_civicrm/tests/phpunit/MergeTest.php
+++ /dev/null
@@ -1,1375 +0,0 @@
-<<< HEAD (639eb6 Merge branch 'master' of
https://gerrit.wikimedia.org/r/wiki)
-===
-imitateAdminUser();
-$this->doDuckHunt();
-// Run through the merge first to make sure there aren't pre-existing
contacts in the DB
-// that will ruin the tests.
-$this->callAPISuccess('Job', 'process_batch_merge', array('mode' =>
'safe'));
-
-$this->contactID =
$this->breedDuck(array(wmf_civicrm_get_custom_field_name('do_not_solicit') =>
0));
-$this->contactID2 =
$this->breedDuck(array(wmf_civicrm_get_custom_field_name('do_not_solicit') =>
1));
- }
-
- public function tearDown() {
-$this->callAPISuccess('Contribution', 'get', array(
- 'contact_id' => array('IN' => array($this->contactID,
$this->contactID2)),
- 'api.Contribution.delete' => 1,
-));
-$this->callAPISuccess('Contact', 'delete', array('id' =>
$this->contactID));
-$this->callAPISuccess('Contact', 'delete', array('id' =>
$this->contactID2));
-parent::tearDown();
- }
-
- /**
- * Test that the merge hook causes our custom fields to not be treated as
conflicts.
- *
- * We also need to check the custom data fields afterwards.
- */
- public function testMergeHook() {
-$this->callAPISuccess('Contribution', 'create', array(
- 'contact_id' => $this->contactID,
- 'financial_type_id' => 'Cash',
- 'total_amount' => 10,
- 'currency' => 'USD',
- // Should cause 'is_2014 to be true.
- 'receive_date' => '2014-08-04',
- wmf_civicrm_get_custom_field_name('original_currency') => 'NZD',
- wmf_civicrm_get_custom_field_name('original_amount') => 8,
-));
-$this->callAPISuccess('Contribution', 'create', array(
- 'contact_id' => $this->contactID2,
- 'financial_type_id' => 'Cash',
- 'total_amount' => 5,
- 'currency' => 'USD',
- // Should cause 'is_2012_donor to be true.
- 'receive_date' => '2013-01-04',
-));
-$this->callAPISuccess('Contribution', 'create', array(
- 'contact_id' => $this->contactID2,
- 'financial_type_id' => 'Cash',
- 'total_amount' => 9,
- 'currency' => 'NZD',
- // Should cause 'is_2015_donor to be true.
- 'receive_date' => '2016-04-04',
-));
-$contact = $this->callAPISuccess('Contact', 'get', array(
- 'id' => $this->contactID,
- 'sequential' => 1,
- 'return' =>
array(wmf_civicrm_get_custom_field_name('lifetime_usd_total'),
wmf_civicrm_get_custom_field_name('do_not_solicit')),
-));
-$this->assertEquals(10,
$contact['values'][0][wmf_civicrm_get_custom_field_name('lifetime_usd_total')]);
-$result = $this->callAPISuccess('Job', 'process_batch_merge', array(
- 'criteria' => array('contact' => array('id' => array('IN' =>
array($this->contactID, $this->contactID2,
-));
-$this->assertEquals(1, count($result['values']['merged']));
-$contact = $this->callAPISuccess('Contact', 'get', array(
- 'id' => $this->contactID,
- 'sequential' => 1,
- 'return' => array(
-wmf_civicrm_get_custom_field_name('lifetime_usd_total'),
-wmf_civicrm_get_custom_field_name('do_not_solicit'),
-wmf_civicrm_get_custom_field_name('last_donation_amount'),
-wmf_civicrm_get_custom_field_name('last_donation_currency'),
-wmf_civicrm_get_custom_field_name('last_donation_usd'),
-wmf_civicrm_get_custom_field_name('last_donation_date'),
-wmf_civicrm_get_custom_field_name('is_2011_donor'),
-wmf_civicrm_get_custom_field_name('is_2012_donor'),
-wmf_civicrm_get_custom_field_name('is_2013_donor'),
-wmf_civicrm_get_custom_field_name('is_2014_donor'),
-wmf_civicrm_get_custom_field_name('is_2015_donor'),
-wmf_civicrm_get_custom_field_name('is_2016_donor'),
- ),
-));
-$this->assertEquals(24,
$contact['values'][0][wmf_civicrm_get_custom_field_name('lifetime_usd_total')]);
-$this->assertEquals(1,
$contact['values'][0][wmf_civicrm_get_custom_field_name('do_not_solicit')]);
-
[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' of https://gerrit.wikimedia.org/r/wiki...
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/342781 )
Change subject: Merge branch 'master' of
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
..
Merge branch 'master' of
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
f6bbf39 Rerun previous blank_address updates with slightly wider catchment.
bf70d74 Do not record dummy data 'N0NE PROVIDED' to the database,
Change-Id: Ia9457db14826598d314afc081587c6aec602fe4d
---
D sites/all/modules/wmf_civicrm/tests/phpunit/AddressImportTest.php
1 file changed, 0 insertions(+), 75 deletions(-)
Approvals:
jenkins-bot: Verified
Eileen: Looks good to me, approved
diff --git a/sites/all/modules/wmf_civicrm/tests/phpunit/AddressImportTest.php
b/sites/all/modules/wmf_civicrm/tests/phpunit/AddressImportTest.php
deleted file mode 100644
index fc576b6..000
--- a/sites/all/modules/wmf_civicrm/tests/phpunit/AddressImportTest.php
+++ /dev/null
@@ -1,75 +0,0 @@
-callAPISuccess('Contact', 'create', array(
- 'first_name' => 'Minnie', 'last_name' => 'Mouse', 'contact_type' =>
'Individual', 'email' => 'min...@mouse.org')
-);
-$this->contactID = $contact['id'];
- }
-
- public function tearDown() {
-CRM_Core_DAO::executeQuery("DELETE FROM civicrm_contact WHERE last_name =
'Mouse'");
- }
-
- /**
- * Test creating an address with void data does not create an address.
- */
- public function testAddressImportVoidData() {
-$msg = array(
- 'currency' => 'USD',
- 'date' => time(),
- 'last_name' => 'Mouse',
- 'email' => 'nob...@wikimedia.org',
- 'gateway' => 'test_gateway',
- 'gateway_txn_id' => mt_rand(),
- 'gross' => '1.23',
- 'payment_method' => 'cc',
- 'street_address' => 'N0NE PROVIDED',
- 'postal_code' => 0,
-);
-
-$contribution = wmf_civicrm_contribution_message_import($msg);
-$addresses = $this->callAPISuccess('Address', 'get', array('contact_id' =>
$contribution['contact_id']));
-$this->assertEquals(0, $addresses['count']);
- }
-
- /**
- * Test creating an address with void data does not create an address.
- *
- * In this case the contact already exists.
- */
- public function testAddressImportVoidDataContactExists() {
-$msg = array(
- 'contact_id' => $this->contactID,
- 'currency' => 'USD',
- 'date' => time(),
- 'last_name' => 'Mouse',
- 'email' => 'nob...@wikimedia.org',
- 'gateway' => 'test_gateway',
- 'gateway_txn_id' => mt_rand(),
- 'gross' => '1.23',
- 'payment_method' => 'cc',
- 'street_address' => 'N0NE PROVIDED',
- 'postal_code' => 0,
-);
-
-$contribution = wmf_civicrm_contribution_message_import($msg);
-$addresses = $this->callAPISuccess('Address', 'get', array('contact_id' =>
$contribution['contact_id']));
-$this->assertEquals(0, $addresses['count']);
- }
-
-}
--
To view, visit https://gerrit.wikimedia.org/r/342781
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia9457db14826598d314afc081587c6aec602fe4d
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Eileen
Gerrit-Reviewer: Eileen
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' of https://gerrit.wikimedia.org/r/wiki...
Eileen has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/342781 )
Change subject: Merge branch 'master' of
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
..
Merge branch 'master' of
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
f6bbf39 Rerun previous blank_address updates with slightly wider catchment.
bf70d74 Do not record dummy data 'N0NE PROVIDED' to the database,
Change-Id: Ia9457db14826598d314afc081587c6aec602fe4d
---
D sites/all/modules/wmf_civicrm/tests/phpunit/AddressImportTest.php
1 file changed, 0 insertions(+), 75 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm
refs/changes/81/342781/1
diff --git a/sites/all/modules/wmf_civicrm/tests/phpunit/AddressImportTest.php
b/sites/all/modules/wmf_civicrm/tests/phpunit/AddressImportTest.php
deleted file mode 100644
index fc576b6..000
--- a/sites/all/modules/wmf_civicrm/tests/phpunit/AddressImportTest.php
+++ /dev/null
@@ -1,75 +0,0 @@
-callAPISuccess('Contact', 'create', array(
- 'first_name' => 'Minnie', 'last_name' => 'Mouse', 'contact_type' =>
'Individual', 'email' => 'min...@mouse.org')
-);
-$this->contactID = $contact['id'];
- }
-
- public function tearDown() {
-CRM_Core_DAO::executeQuery("DELETE FROM civicrm_contact WHERE last_name =
'Mouse'");
- }
-
- /**
- * Test creating an address with void data does not create an address.
- */
- public function testAddressImportVoidData() {
-$msg = array(
- 'currency' => 'USD',
- 'date' => time(),
- 'last_name' => 'Mouse',
- 'email' => 'nob...@wikimedia.org',
- 'gateway' => 'test_gateway',
- 'gateway_txn_id' => mt_rand(),
- 'gross' => '1.23',
- 'payment_method' => 'cc',
- 'street_address' => 'N0NE PROVIDED',
- 'postal_code' => 0,
-);
-
-$contribution = wmf_civicrm_contribution_message_import($msg);
-$addresses = $this->callAPISuccess('Address', 'get', array('contact_id' =>
$contribution['contact_id']));
-$this->assertEquals(0, $addresses['count']);
- }
-
- /**
- * Test creating an address with void data does not create an address.
- *
- * In this case the contact already exists.
- */
- public function testAddressImportVoidDataContactExists() {
-$msg = array(
- 'contact_id' => $this->contactID,
- 'currency' => 'USD',
- 'date' => time(),
- 'last_name' => 'Mouse',
- 'email' => 'nob...@wikimedia.org',
- 'gateway' => 'test_gateway',
- 'gateway_txn_id' => mt_rand(),
- 'gross' => '1.23',
- 'payment_method' => 'cc',
- 'street_address' => 'N0NE PROVIDED',
- 'postal_code' => 0,
-);
-
-$contribution = wmf_civicrm_contribution_message_import($msg);
-$addresses = $this->callAPISuccess('Address', 'get', array('contact_id' =>
$contribution['contact_id']));
-$this->assertEquals(0, $addresses['count']);
- }
-
-}
--
To view, visit https://gerrit.wikimedia.org/r/342781
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia9457db14826598d314afc081587c6aec602fe4d
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Eileen
___
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' of https://gerrit.wikimedia.org/r/wiki...
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/342155 )
Change subject: Merge branch 'master' of
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
..
Merge branch 'master' of
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
+ 3b4798099b65e239b2a56379f54e0d90f30f0924 Normalized subscr_ messages for tests
+ 41826252f5c2fb75c69c1c69eb0a791015d7b79f Remove unchanged insertions of blank
addresses.
+ aec23907e99cfb4228b6e0333f712a2c54e596e6 Remove obsolete blank address from
tracking table.
+ 54439c652fe886d53981824bc9bc3d4116300911 Remove bulk update blank addresses
from being treated as 'updates'.
+ da48b2a9f00c3066159d7c59ecc7d7a4a1c9c057 Add trilogy payment_method to
foreign checks import
+ a5043f6da76330677d9152b7c39fe8f5986cc727 Add & use Benevity financial type.
+ 2b6b8b851fcfa377849b873821a9444987b852bc Submodule update for CiviCRM 91d02f7
CRM-20061 Add tables as a parameter on the revert api
+ 86111d242bc9623b793b617323284f6aae652164 Benevity import, still create
relationship when no individual gift
+ 0b8ab4e43a73b989be6608ad39061015c1da6331 Loosen Benevity matching logic for
individuals.
+ ea0b2b5c0891e5257c71f012e314405f0ffe5c74 More loosening of benevity matching
logic.
+ 9d14b17cc3c167522b5e9681213cd8cc6b01d922 Even more loosening of benevity
matching logic.
Change-Id: Icfd0abbd599115efdefe96ab2fa01f23858d3765
---
D sites/all/modules/offline2civicrm/tests/BenevityTest.php
D sites/all/modules/offline2civicrm/tests/ForeignChecksFileTest.php
D
sites/all/modules/offline2civicrm/tests/data/benevity_mice_no_email_matched_only.csv
D sites/all/modules/offline2civicrm/tests/data/foreign_checks_trilogy.csv
D sites/all/modules/queue2civicrm/tests/data/subscr_payment_normalized.json
D sites/all/modules/queue2civicrm/tests/data/subscr_signup_normalized.json
6 files changed, 0 insertions(+), 683 deletions(-)
Approvals:
jenkins-bot: Verified
Eileen: Looks good to me, approved
diff --git a/sites/all/modules/offline2civicrm/tests/BenevityTest.php
b/sites/all/modules/offline2civicrm/tests/BenevityTest.php
deleted file mode 100644
index f3a138e..000
--- a/sites/all/modules/offline2civicrm/tests/BenevityTest.php
+++ /dev/null
@@ -1,548 +0,0 @@
-<<< HEAD (d20ed4 Merge master into deployment)
-===
-https://phabricator.wikimedia.org/T115044#3012232
- */
-class BenevityTest extends BaseChecksFileTest {
- protected $epochtime;
-
- function setUp() {
-parent::setUp();
-
-$this->epochtime = wmf_common_date_parse_string('2016-09-15');
-$this->setExchangeRates($this->epochtime, array('USD' => 1, 'BTC' => 3));
-$this->gateway = 'benevity';
-civicrm_initialize();
-CRM_Core_DAO::executeQuery("
- DELETE FROM civicrm_contribution
- WHERE trxn_id LIKE 'BENEVITY%'
-");
-CRM_Core_DAO::executeQuery("
- DELETE FROM civicrm_contact
- WHERE organization_name IN('Donald Duck Inc', 'Mickey Mouse Inc', 'Goofy
Inc', 'Uncle Scrooge Inc')
- OR nick_name IN('Donald Duck Inc', 'Mickey Mouse Inc', 'Goofy Inc',
'Uncle Scrooge Inc')
- OR first_name = 'Minnie' AND last_name = 'Mouse'
- OR first_name = 'Pluto'
-");
-$this->ensureAnonymousContactExists();
-\Civi::$statics = array();
-$countries = $this->callAPISuccess('Country', 'get', array());
-$this->callAPISuccess('Setting', 'create', array('countryLimit' =>
array_keys($countries['values'])));
-
- }
-
- /**
- * Make sure we have the anonymous contact - like the live DB.
- */
- protected function ensureAnonymousContactExists() {
-$anonymousParams = array(
- 'first_name' => 'Anonymous',
- 'last_name' => 'Anonymous',
- 'email' => 'fakeem...@wikimedia.org',
- 'contact_type' => 'Individual',
-);
-$contacts = $this->callAPISuccess('Contact', 'get', $anonymousParams);
-if ($contacts['count'] == 0) {
- $this->callAPISuccess('Contact', 'create', $anonymousParams);
-}
-$contacts = $this->callAPISuccess('Contact', 'get', $anonymousParams);
-$this->assertEquals(1, $contacts['count']);
- }
-
- /**
- * Test that all imports fail if the organization has multiple matches.
- */
- function testImportFailOrganizationContactAmbiguous() {
-$this->callAPISuccess('Contact', 'create', array('organization_name' =>
'Donald Duck Inc', 'contact_type' => 'Organization'));
-$this->callAPISuccess('Contact', 'create', array('organization_name' =>
'Donald Duck Inc', 'contact_type' => 'Organization'));
-$importer = new BenevityFile( __DIR__ . "/data/benevity.csv" );
-$importer->import();
-$messages = $importer->getMessages();
-$this->assertEquals('0 out of 4 rows were imported.', $messages['Result']);
- }
-
- /**
- * Test that all imports fail if the organization does not pre-exist.
- */
- function testImportFailNoOrganizationContactExists() {
-
[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' of https://gerrit.wikimedia.org/r/wiki...
Eileen has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/342155 )
Change subject: Merge branch 'master' of
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
..
Merge branch 'master' of
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
+ 3b4798099b65e239b2a56379f54e0d90f30f0924 Normalized subscr_ messages for tests
+ 41826252f5c2fb75c69c1c69eb0a791015d7b79f Remove unchanged insertions of blank
addresses.
+ aec23907e99cfb4228b6e0333f712a2c54e596e6 Remove obsolete blank address from
tracking table.
+ 54439c652fe886d53981824bc9bc3d4116300911 Remove bulk update blank addresses
from being treated as 'updates'.
+ da48b2a9f00c3066159d7c59ecc7d7a4a1c9c057 Add trilogy payment_method to
foreign checks import
+ a5043f6da76330677d9152b7c39fe8f5986cc727 Add & use Benevity financial type.
+ 2b6b8b851fcfa377849b873821a9444987b852bc Submodule update for CiviCRM 91d02f7
CRM-20061 Add tables as a parameter on the revert api
+ 86111d242bc9623b793b617323284f6aae652164 Benevity import, still create
relationship when no individual gift
+ 0b8ab4e43a73b989be6608ad39061015c1da6331 Loosen Benevity matching logic for
individuals.
+ ea0b2b5c0891e5257c71f012e314405f0ffe5c74 More loosening of benevity matching
logic.
+ 9d14b17cc3c167522b5e9681213cd8cc6b01d922 Even more loosening of benevity
matching logic.
Change-Id: Icfd0abbd599115efdefe96ab2fa01f23858d3765
---
D sites/all/modules/offline2civicrm/tests/BenevityTest.php
D sites/all/modules/offline2civicrm/tests/ForeignChecksFileTest.php
D
sites/all/modules/offline2civicrm/tests/data/benevity_mice_no_email_matched_only.csv
D sites/all/modules/offline2civicrm/tests/data/foreign_checks_trilogy.csv
4 files changed, 0 insertions(+), 637 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm
refs/changes/55/342155/1
diff --git a/sites/all/modules/offline2civicrm/tests/BenevityTest.php
b/sites/all/modules/offline2civicrm/tests/BenevityTest.php
deleted file mode 100644
index f3a138e..000
--- a/sites/all/modules/offline2civicrm/tests/BenevityTest.php
+++ /dev/null
@@ -1,548 +0,0 @@
-<<< HEAD (d20ed4 Merge master into deployment)
-===
-https://phabricator.wikimedia.org/T115044#3012232
- */
-class BenevityTest extends BaseChecksFileTest {
- protected $epochtime;
-
- function setUp() {
-parent::setUp();
-
-$this->epochtime = wmf_common_date_parse_string('2016-09-15');
-$this->setExchangeRates($this->epochtime, array('USD' => 1, 'BTC' => 3));
-$this->gateway = 'benevity';
-civicrm_initialize();
-CRM_Core_DAO::executeQuery("
- DELETE FROM civicrm_contribution
- WHERE trxn_id LIKE 'BENEVITY%'
-");
-CRM_Core_DAO::executeQuery("
- DELETE FROM civicrm_contact
- WHERE organization_name IN('Donald Duck Inc', 'Mickey Mouse Inc', 'Goofy
Inc', 'Uncle Scrooge Inc')
- OR nick_name IN('Donald Duck Inc', 'Mickey Mouse Inc', 'Goofy Inc',
'Uncle Scrooge Inc')
- OR first_name = 'Minnie' AND last_name = 'Mouse'
- OR first_name = 'Pluto'
-");
-$this->ensureAnonymousContactExists();
-\Civi::$statics = array();
-$countries = $this->callAPISuccess('Country', 'get', array());
-$this->callAPISuccess('Setting', 'create', array('countryLimit' =>
array_keys($countries['values'])));
-
- }
-
- /**
- * Make sure we have the anonymous contact - like the live DB.
- */
- protected function ensureAnonymousContactExists() {
-$anonymousParams = array(
- 'first_name' => 'Anonymous',
- 'last_name' => 'Anonymous',
- 'email' => 'fakeem...@wikimedia.org',
- 'contact_type' => 'Individual',
-);
-$contacts = $this->callAPISuccess('Contact', 'get', $anonymousParams);
-if ($contacts['count'] == 0) {
- $this->callAPISuccess('Contact', 'create', $anonymousParams);
-}
-$contacts = $this->callAPISuccess('Contact', 'get', $anonymousParams);
-$this->assertEquals(1, $contacts['count']);
- }
-
- /**
- * Test that all imports fail if the organization has multiple matches.
- */
- function testImportFailOrganizationContactAmbiguous() {
-$this->callAPISuccess('Contact', 'create', array('organization_name' =>
'Donald Duck Inc', 'contact_type' => 'Organization'));
-$this->callAPISuccess('Contact', 'create', array('organization_name' =>
'Donald Duck Inc', 'contact_type' => 'Organization'));
-$importer = new BenevityFile( __DIR__ . "/data/benevity.csv" );
-$importer->import();
-$messages = $importer->getMessages();
-$this->assertEquals('0 out of 4 rows were imported.', $messages['Result']);
- }
-
- /**
- * Test that all imports fail if the organization does not pre-exist.
- */
- function testImportFailNoOrganizationContactExists() {
-$importer = new BenevityFile( __DIR__ . "/data/benevity.csv" );
-$importer->import();
-$messages = $importer->getMessages();
-$t
[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' of https://gerrit.wikimedia.org/r/wiki...
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/340674 ) Change subject: Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment .. Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment f0e1b2c Loosen comparison in validation script for processing global collect. be44b1b Rerun the geocoding. Change-Id: I32a3d3e4968dec811f2e36ae310809e6af9c292c --- 0 files changed, 0 insertions(+), 0 deletions(-) Approvals: jenkins-bot: Verified Eileen: Looks good to me, approved -- To view, visit https://gerrit.wikimedia.org/r/340674 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I32a3d3e4968dec811f2e36ae310809e6af9c292c Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: deployment Gerrit-Owner: Eileen Gerrit-Reviewer: Eileen 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' of https://gerrit.wikimedia.org/r/wiki...
Eileen has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/340674 ) Change subject: Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment .. Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment f0e1b2c Loosen comparison in validation script for processing global collect. be44b1b Rerun the geocoding. Change-Id: I32a3d3e4968dec811f2e36ae310809e6af9c292c --- 0 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm refs/changes/74/340674/1 -- To view, visit https://gerrit.wikimedia.org/r/340674 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I32a3d3e4968dec811f2e36ae310809e6af9c292c Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: deployment Gerrit-Owner: Eileen ___ 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' of https://gerrit.wikimedia.org/r/wiki...
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/340448 )
Change subject: Merge branch 'master' of
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
..
Merge branch 'master' of
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
2d2ef0a Benevity update, handle situation where the Benevity email might be
work but wmf email is home.
f4d8eeb Broaden the definition of 'employed by' an org to include soft credits.
Change-Id: I1f21d71ff1bb6c5761cc563927af6c9a864e9333
---
D sites/all/modules/offline2civicrm/tests/BenevityTest.php
1 file changed, 0 insertions(+), 455 deletions(-)
Approvals:
jenkins-bot: Verified
Eileen: Looks good to me, approved
diff --git a/sites/all/modules/offline2civicrm/tests/BenevityTest.php
b/sites/all/modules/offline2civicrm/tests/BenevityTest.php
deleted file mode 100644
index 8603410..000
--- a/sites/all/modules/offline2civicrm/tests/BenevityTest.php
+++ /dev/null
@@ -1,455 +0,0 @@
-<<< HEAD (04b49b Merge branch 'master' of
https://gerrit.wikimedia.org/r/wiki)
-===
-https://phabricator.wikimedia.org/T115044#3012232
- */
-class BenevityTest extends BaseChecksFileTest {
- protected $epochtime;
-
- function setUp() {
-parent::setUp();
-
-$this->epochtime = wmf_common_date_parse_string('2016-09-15');
-$this->setExchangeRates($this->epochtime, array('USD' => 1, 'BTC' => 3));
-$this->gateway = 'benevity';
-civicrm_initialize();
-CRM_Core_DAO::executeQuery("
- DELETE FROM civicrm_contribution
- WHERE trxn_id LIKE 'BENEVITY%'
-");
-CRM_Core_DAO::executeQuery("
- DELETE FROM civicrm_contact
- WHERE organization_name IN('Donald Duck Inc', 'Mickey Mouse Inc', 'Goofy
Inc', 'Uncle Scrooge Inc')
- OR nick_name IN('Donald Duck Inc', 'Mickey Mouse Inc', 'Goofy Inc',
'Uncle Scrooge Inc')
- OR first_name = 'Minnie' AND last_name = 'Mouse'
- OR first_name = 'Pluto'
-");
-$this->ensureAnonymousContactExists();
-\Civi::$statics = array();
-$countries = $this->callAPISuccess('Country', 'get', array());
-$this->callAPISuccess('Setting', 'create', array('countryLimit' =>
array_keys($countries['values'])));
-
- }
-
- /**
- * Make sure we have the anonymous contact - like the live DB.
- */
- protected function ensureAnonymousContactExists() {
-$anonymousParams = array(
- 'first_name' => 'Anonymous',
- 'last_name' => 'Anonymous',
- 'email' => 'fakeem...@wikimedia.org',
- 'contact_type' => 'Individual',
-);
-$contacts = $this->callAPISuccess('Contact', 'get', $anonymousParams);
-if ($contacts['count'] == 0) {
- $this->callAPISuccess('Contact', 'create', $anonymousParams);
-}
-$contacts = $this->callAPISuccess('Contact', 'get', $anonymousParams);
-$this->assertEquals(1, $contacts['count']);
- }
-
- /**
- * Test that all imports fail if the organization has multiple matches.
- */
- function testImportFailOrganizationContactAmbiguous() {
-$this->callAPISuccess('Contact', 'create', array('organization_name' =>
'Donald Duck Inc', 'contact_type' => 'Organization'));
-$this->callAPISuccess('Contact', 'create', array('organization_name' =>
'Donald Duck Inc', 'contact_type' => 'Organization'));
-$importer = new BenevityFile( __DIR__ . "/data/benevity.csv" );
-$importer->import();
-$messages = $importer->getMessages();
-$this->assertEquals('0 out of 4 rows were imported.', $messages['Result']);
- }
-
- /**
- * Test that all imports fail if the organization does not pre-exist.
- */
- function testImportFailNoOrganizationContactExists() {
-$importer = new BenevityFile( __DIR__ . "/data/benevity.csv" );
-$importer->import();
-$messages = $importer->getMessages();
-$this->assertEquals('0 out of 4 rows were imported.', $messages['Result']);
- }
-
- /**
- * Test that import passes for the contact if a single match is found.
- */
- function testImportSucceedOrganizationSingleContactExists() {
-$this->callAPISuccess('Contact', 'create', array('organization_name' =>
'Donald Duck Inc', 'contact_type' => 'Organization'));
-$importer = new BenevityFile( __DIR__ . "/data/benevity.csv" );
-$importer->import();
-$messages = $importer->getMessages();
-$this->assertEquals('1 out of 4 rows were imported.', $messages['Result']);
- }
-
- /**
- * Test that import passes for the Individual contact if a single match is
found.
- */
- function testImportSucceedIndividualSingleContactExists() {
-$thaMouseMeister = $this->callAPISuccess('Contact', 'create',
array('organization_name' => 'Mickey Mouse Inc', 'contact_type' =>
'Organization'));
-$minnie = $this->callAPISuccess('Contact', 'create', array(
- 'first_name' => 'Minnie', 'last_name' => 'Mouse', 'contact_type' =>
'Individual', 'email' => 'min...@mouse.org'
[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' of https://gerrit.wikimedia.org/r/wiki...
Eileen has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/340448 )
Change subject: Merge branch 'master' of
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
..
Merge branch 'master' of
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
2d2ef0a Benevity update, handle situation where the Benevity email might be
work but wmf email is home.
f4d8eeb Broaden the definition of 'employed by' an org to include soft credits.
Change-Id: I1f21d71ff1bb6c5761cc563927af6c9a864e9333
---
D sites/all/modules/offline2civicrm/tests/BenevityTest.php
1 file changed, 0 insertions(+), 455 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm
refs/changes/48/340448/1
diff --git a/sites/all/modules/offline2civicrm/tests/BenevityTest.php
b/sites/all/modules/offline2civicrm/tests/BenevityTest.php
deleted file mode 100644
index 8603410..000
--- a/sites/all/modules/offline2civicrm/tests/BenevityTest.php
+++ /dev/null
@@ -1,455 +0,0 @@
-<<< HEAD (04b49b Merge branch 'master' of
https://gerrit.wikimedia.org/r/wiki)
-===
-https://phabricator.wikimedia.org/T115044#3012232
- */
-class BenevityTest extends BaseChecksFileTest {
- protected $epochtime;
-
- function setUp() {
-parent::setUp();
-
-$this->epochtime = wmf_common_date_parse_string('2016-09-15');
-$this->setExchangeRates($this->epochtime, array('USD' => 1, 'BTC' => 3));
-$this->gateway = 'benevity';
-civicrm_initialize();
-CRM_Core_DAO::executeQuery("
- DELETE FROM civicrm_contribution
- WHERE trxn_id LIKE 'BENEVITY%'
-");
-CRM_Core_DAO::executeQuery("
- DELETE FROM civicrm_contact
- WHERE organization_name IN('Donald Duck Inc', 'Mickey Mouse Inc', 'Goofy
Inc', 'Uncle Scrooge Inc')
- OR nick_name IN('Donald Duck Inc', 'Mickey Mouse Inc', 'Goofy Inc',
'Uncle Scrooge Inc')
- OR first_name = 'Minnie' AND last_name = 'Mouse'
- OR first_name = 'Pluto'
-");
-$this->ensureAnonymousContactExists();
-\Civi::$statics = array();
-$countries = $this->callAPISuccess('Country', 'get', array());
-$this->callAPISuccess('Setting', 'create', array('countryLimit' =>
array_keys($countries['values'])));
-
- }
-
- /**
- * Make sure we have the anonymous contact - like the live DB.
- */
- protected function ensureAnonymousContactExists() {
-$anonymousParams = array(
- 'first_name' => 'Anonymous',
- 'last_name' => 'Anonymous',
- 'email' => 'fakeem...@wikimedia.org',
- 'contact_type' => 'Individual',
-);
-$contacts = $this->callAPISuccess('Contact', 'get', $anonymousParams);
-if ($contacts['count'] == 0) {
- $this->callAPISuccess('Contact', 'create', $anonymousParams);
-}
-$contacts = $this->callAPISuccess('Contact', 'get', $anonymousParams);
-$this->assertEquals(1, $contacts['count']);
- }
-
- /**
- * Test that all imports fail if the organization has multiple matches.
- */
- function testImportFailOrganizationContactAmbiguous() {
-$this->callAPISuccess('Contact', 'create', array('organization_name' =>
'Donald Duck Inc', 'contact_type' => 'Organization'));
-$this->callAPISuccess('Contact', 'create', array('organization_name' =>
'Donald Duck Inc', 'contact_type' => 'Organization'));
-$importer = new BenevityFile( __DIR__ . "/data/benevity.csv" );
-$importer->import();
-$messages = $importer->getMessages();
-$this->assertEquals('0 out of 4 rows were imported.', $messages['Result']);
- }
-
- /**
- * Test that all imports fail if the organization does not pre-exist.
- */
- function testImportFailNoOrganizationContactExists() {
-$importer = new BenevityFile( __DIR__ . "/data/benevity.csv" );
-$importer->import();
-$messages = $importer->getMessages();
-$this->assertEquals('0 out of 4 rows were imported.', $messages['Result']);
- }
-
- /**
- * Test that import passes for the contact if a single match is found.
- */
- function testImportSucceedOrganizationSingleContactExists() {
-$this->callAPISuccess('Contact', 'create', array('organization_name' =>
'Donald Duck Inc', 'contact_type' => 'Organization'));
-$importer = new BenevityFile( __DIR__ . "/data/benevity.csv" );
-$importer->import();
-$messages = $importer->getMessages();
-$this->assertEquals('1 out of 4 rows were imported.', $messages['Result']);
- }
-
- /**
- * Test that import passes for the Individual contact if a single match is
found.
- */
- function testImportSucceedIndividualSingleContactExists() {
-$thaMouseMeister = $this->callAPISuccess('Contact', 'create',
array('organization_name' => 'Mickey Mouse Inc', 'contact_type' =>
'Organization'));
-$minnie = $this->callAPISuccess('Contact', 'create', array(
- 'first_name' => 'Minnie', 'last_name' => 'Mouse', 'contact_type' =>
'Individual', 'email' => 'min...@
[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' of https://gerrit.wikimedia.org/r/wiki...
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/340364 )
Change subject: Merge branch 'master' of
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
..
Merge branch 'master' of
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
5cfd416 Set financial_type for Benevity imports to Engage.
7eb8113 Benevity import: ensure that the individual is soft credited when there
is no individual part of the gift.
Change-Id: I8f96637d3fd08b8c0da371053f2c341a4f942d5b
---
D sites/all/modules/offline2civicrm/tests/BenevityTest.php
D sites/all/modules/offline2civicrm/tests/data/benevity_only_match.csv
2 files changed, 0 insertions(+), 390 deletions(-)
Approvals:
jenkins-bot: Verified
Eileen: Looks good to me, approved
diff --git a/sites/all/modules/offline2civicrm/tests/BenevityTest.php
b/sites/all/modules/offline2civicrm/tests/BenevityTest.php
deleted file mode 100644
index 4a75a1d..000
--- a/sites/all/modules/offline2civicrm/tests/BenevityTest.php
+++ /dev/null
@@ -1,388 +0,0 @@
-<<< HEAD (a2875c Merge master into deployment)
-===
-https://phabricator.wikimedia.org/T115044#3012232
- */
-class BenevityTest extends BaseChecksFileTest {
- protected $epochtime;
-
- function setUp() {
-parent::setUp();
-
-$this->epochtime = wmf_common_date_parse_string('2016-09-15');
-$this->setExchangeRates($this->epochtime, array('USD' => 1, 'BTC' => 3));
-$this->gateway = 'benevity';
-civicrm_initialize();
-CRM_Core_DAO::executeQuery("
- DELETE FROM civicrm_contribution
- WHERE trxn_id LIKE 'BENEVITY%'
-");
-CRM_Core_DAO::executeQuery("
- DELETE FROM civicrm_contact
- WHERE organization_name IN('Donald Duck Inc', 'Mickey Mouse Inc', 'Goofy
Inc', 'Uncle Scrooge Inc')
- OR nick_name IN('Donald Duck Inc', 'Mickey Mouse Inc', 'Goofy Inc',
'Uncle Scrooge Inc')
- OR first_name = 'Minnie' AND last_name = 'Mouse'
- OR first_name = 'Pluto'
-");
-$this->ensureAnonymousContactExists();
-\Civi::$statics = array();
-$countries = $this->callAPISuccess('Country', 'get', array());
-$this->callAPISuccess('Setting', 'create', array('countryLimit' =>
array_keys($countries['values'])));
-
- }
-
- /**
- * Make sure we have the anonymous contact - like the live DB.
- */
- protected function ensureAnonymousContactExists() {
-$anonymousParams = array(
- 'first_name' => 'Anonymous',
- 'last_name' => 'Anonymous',
- 'email' => 'fakeem...@wikimedia.org',
- 'contact_type' => 'Individual',
-);
-$contacts = $this->callAPISuccess('Contact', 'get', $anonymousParams);
-if ($contacts['count'] == 0) {
- $this->callAPISuccess('Contact', 'create', $anonymousParams);
-}
-$contacts = $this->callAPISuccess('Contact', 'get', $anonymousParams);
-$this->assertEquals(1, $contacts['count']);
- }
-
- /**
- * Test that all imports fail if the organization has multiple matches.
- */
- function testImportFailOrganizationContactAmbiguous() {
-$this->callAPISuccess('Contact', 'create', array('organization_name' =>
'Donald Duck Inc', 'contact_type' => 'Organization'));
-$this->callAPISuccess('Contact', 'create', array('organization_name' =>
'Donald Duck Inc', 'contact_type' => 'Organization'));
-$importer = new BenevityFile( __DIR__ . "/data/benevity.csv" );
-$importer->import();
-$messages = $importer->getMessages();
-$this->assertEquals('0 out of 4 rows were imported.', $messages['Result']);
- }
-
- /**
- * Test that all imports fail if the organization does not pre-exist.
- */
- function testImportFailNoOrganizationContactExists() {
-$importer = new BenevityFile( __DIR__ . "/data/benevity.csv" );
-$importer->import();
-$messages = $importer->getMessages();
-$this->assertEquals('0 out of 4 rows were imported.', $messages['Result']);
- }
-
- /**
- * Test that import passes for the contact if a single match is found.
- */
- function testImportSucceedOrganizationSingleContactExists() {
-$this->callAPISuccess('Contact', 'create', array('organization_name' =>
'Donald Duck Inc', 'contact_type' => 'Organization'));
-$importer = new BenevityFile( __DIR__ . "/data/benevity.csv" );
-$importer->import();
-$messages = $importer->getMessages();
-$this->assertEquals('1 out of 4 rows were imported.', $messages['Result']);
- }
-
- /**
- * Test that import passes for the Individual contact if a single match is
found.
- */
- function testImportSucceedIndividualSingleContactExists() {
-$thaMouseMeister = $this->callAPISuccess('Contact', 'create',
array('organization_name' => 'Mickey Mouse Inc', 'contact_type' =>
'Organization'));
-$minnie = $this->callAPISuccess('Contact', 'create', array(
- 'first_name' => 'Minnie', 'last_name' => 'Mouse', 'contact_type' =>
'Individual',
[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' of https://gerrit.wikimedia.org/r/wiki...
Eileen has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/340364 )
Change subject: Merge branch 'master' of
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
..
Merge branch 'master' of
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
5cfd416 Set financial_type for Benevity imports to Engage.
7eb8113 Benevity import: ensure that the individual is soft credited when there
is no individual part of the gift.
Change-Id: I8f96637d3fd08b8c0da371053f2c341a4f942d5b
---
D sites/all/modules/offline2civicrm/tests/BenevityTest.php
D sites/all/modules/offline2civicrm/tests/data/benevity_only_match.csv
2 files changed, 0 insertions(+), 390 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm
refs/changes/64/340364/1
diff --git a/sites/all/modules/offline2civicrm/tests/BenevityTest.php
b/sites/all/modules/offline2civicrm/tests/BenevityTest.php
deleted file mode 100644
index 4a75a1d..000
--- a/sites/all/modules/offline2civicrm/tests/BenevityTest.php
+++ /dev/null
@@ -1,388 +0,0 @@
-<<< HEAD (a2875c Merge master into deployment)
-===
-https://phabricator.wikimedia.org/T115044#3012232
- */
-class BenevityTest extends BaseChecksFileTest {
- protected $epochtime;
-
- function setUp() {
-parent::setUp();
-
-$this->epochtime = wmf_common_date_parse_string('2016-09-15');
-$this->setExchangeRates($this->epochtime, array('USD' => 1, 'BTC' => 3));
-$this->gateway = 'benevity';
-civicrm_initialize();
-CRM_Core_DAO::executeQuery("
- DELETE FROM civicrm_contribution
- WHERE trxn_id LIKE 'BENEVITY%'
-");
-CRM_Core_DAO::executeQuery("
- DELETE FROM civicrm_contact
- WHERE organization_name IN('Donald Duck Inc', 'Mickey Mouse Inc', 'Goofy
Inc', 'Uncle Scrooge Inc')
- OR nick_name IN('Donald Duck Inc', 'Mickey Mouse Inc', 'Goofy Inc',
'Uncle Scrooge Inc')
- OR first_name = 'Minnie' AND last_name = 'Mouse'
- OR first_name = 'Pluto'
-");
-$this->ensureAnonymousContactExists();
-\Civi::$statics = array();
-$countries = $this->callAPISuccess('Country', 'get', array());
-$this->callAPISuccess('Setting', 'create', array('countryLimit' =>
array_keys($countries['values'])));
-
- }
-
- /**
- * Make sure we have the anonymous contact - like the live DB.
- */
- protected function ensureAnonymousContactExists() {
-$anonymousParams = array(
- 'first_name' => 'Anonymous',
- 'last_name' => 'Anonymous',
- 'email' => 'fakeem...@wikimedia.org',
- 'contact_type' => 'Individual',
-);
-$contacts = $this->callAPISuccess('Contact', 'get', $anonymousParams);
-if ($contacts['count'] == 0) {
- $this->callAPISuccess('Contact', 'create', $anonymousParams);
-}
-$contacts = $this->callAPISuccess('Contact', 'get', $anonymousParams);
-$this->assertEquals(1, $contacts['count']);
- }
-
- /**
- * Test that all imports fail if the organization has multiple matches.
- */
- function testImportFailOrganizationContactAmbiguous() {
-$this->callAPISuccess('Contact', 'create', array('organization_name' =>
'Donald Duck Inc', 'contact_type' => 'Organization'));
-$this->callAPISuccess('Contact', 'create', array('organization_name' =>
'Donald Duck Inc', 'contact_type' => 'Organization'));
-$importer = new BenevityFile( __DIR__ . "/data/benevity.csv" );
-$importer->import();
-$messages = $importer->getMessages();
-$this->assertEquals('0 out of 4 rows were imported.', $messages['Result']);
- }
-
- /**
- * Test that all imports fail if the organization does not pre-exist.
- */
- function testImportFailNoOrganizationContactExists() {
-$importer = new BenevityFile( __DIR__ . "/data/benevity.csv" );
-$importer->import();
-$messages = $importer->getMessages();
-$this->assertEquals('0 out of 4 rows were imported.', $messages['Result']);
- }
-
- /**
- * Test that import passes for the contact if a single match is found.
- */
- function testImportSucceedOrganizationSingleContactExists() {
-$this->callAPISuccess('Contact', 'create', array('organization_name' =>
'Donald Duck Inc', 'contact_type' => 'Organization'));
-$importer = new BenevityFile( __DIR__ . "/data/benevity.csv" );
-$importer->import();
-$messages = $importer->getMessages();
-$this->assertEquals('1 out of 4 rows were imported.', $messages['Result']);
- }
-
- /**
- * Test that import passes for the Individual contact if a single match is
found.
- */
- function testImportSucceedIndividualSingleContactExists() {
-$thaMouseMeister = $this->callAPISuccess('Contact', 'create',
array('organization_name' => 'Mickey Mouse Inc', 'contact_type' =>
'Organization'));
-$minnie = $this->callAPISuccess('Contact', 'create', array(
- 'first_name' => 'Minnie', 'last_name' => 'Mouse', 'contact_type' =>
'Ind
[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' of https://gerrit.wikimedia.org/r/wiki...
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/338033 ) Change subject: Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment .. Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment 41cc249 Further Benevity report fix on handling on formatted '0'. Change-Id: I595b1ed6509882ce75cdd7df2eca06b1a29e9a55 --- D sites/all/modules/offline2civicrm/tests/data/benevity.csv 1 file changed, 0 insertions(+), 8 deletions(-) Approvals: jenkins-bot: Verified Eileen: Looks good to me, approved diff --git a/sites/all/modules/offline2civicrm/tests/data/benevity.csv b/sites/all/modules/offline2civicrm/tests/data/benevity.csv deleted file mode 100644 index 15fed83..000 --- a/sites/all/modules/offline2civicrm/tests/data/benevity.csv +++ /dev/null @@ -1,8 +0,0 @@ -<<< HEAD (1ffc09 Merge branch 'master' of https://gerrit.wikimedia.org/r/wiki) -=== -Participating Corporation,Project,Date of Donation,Donor First Name,Donor Last Name,Email,Address,City,State/Province,Postal Code,Comment,Transaction ID,Donation Frequency,Donation Amount,Matched Amount,Total -Donald Duck Inc,,2015-11-01,Hewey,Duck,he...@duck.org,2 Quacker Road,Duckville,CA,90210,,trxn-QUACK,One-time,200,0.00,200 -Mickey Mouse Inc,WIKIPEDIA,2015-11-02,Minnie,Mouse,min...@mouse.org,2 Cheesey Place,Mouseville,CA,90210,,trxn-SQUEAK,One-time,100,100,200 -Goofy Inc,,2015-11-02,Pluto,Not shared by donor,Not shared by donor,Not shared by donor,Not shared by donor,Not shared by donor,90210,,trxn-WOOF,One-time,22.00,25.00,47 -Uncle Scrooge Inc,,2015-11-02,Not shared by donor,Not shared by donor,Not shared by donor,Not shared by donor,Not shared by donor,Not shared by donor,90210,Very stingy,trxn-AARF,Recurring,0.00,0.5,0.5 ->>> BRANCH (41cc24 Further Benevity report fix on handling on formatted '0'.) -- To view, visit https://gerrit.wikimedia.org/r/338033 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I595b1ed6509882ce75cdd7df2eca06b1a29e9a55 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: deployment Gerrit-Owner: Eileen Gerrit-Reviewer: Eileen 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' of https://gerrit.wikimedia.org/r/wiki...
Eileen has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/338033 ) Change subject: Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment .. Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment 41cc249 Further Benevity report fix on handling on formatted '0'. Change-Id: I595b1ed6509882ce75cdd7df2eca06b1a29e9a55 --- D sites/all/modules/offline2civicrm/tests/data/benevity.csv 1 file changed, 0 insertions(+), 8 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm refs/changes/33/338033/1 diff --git a/sites/all/modules/offline2civicrm/tests/data/benevity.csv b/sites/all/modules/offline2civicrm/tests/data/benevity.csv deleted file mode 100644 index 15fed83..000 --- a/sites/all/modules/offline2civicrm/tests/data/benevity.csv +++ /dev/null @@ -1,8 +0,0 @@ -<<< HEAD (1ffc09 Merge branch 'master' of https://gerrit.wikimedia.org/r/wiki) -=== -Participating Corporation,Project,Date of Donation,Donor First Name,Donor Last Name,Email,Address,City,State/Province,Postal Code,Comment,Transaction ID,Donation Frequency,Donation Amount,Matched Amount,Total -Donald Duck Inc,,2015-11-01,Hewey,Duck,he...@duck.org,2 Quacker Road,Duckville,CA,90210,,trxn-QUACK,One-time,200,0.00,200 -Mickey Mouse Inc,WIKIPEDIA,2015-11-02,Minnie,Mouse,min...@mouse.org,2 Cheesey Place,Mouseville,CA,90210,,trxn-SQUEAK,One-time,100,100,200 -Goofy Inc,,2015-11-02,Pluto,Not shared by donor,Not shared by donor,Not shared by donor,Not shared by donor,Not shared by donor,90210,,trxn-WOOF,One-time,22.00,25.00,47 -Uncle Scrooge Inc,,2015-11-02,Not shared by donor,Not shared by donor,Not shared by donor,Not shared by donor,Not shared by donor,Not shared by donor,90210,Very stingy,trxn-AARF,Recurring,0.00,0.5,0.5 ->>> BRANCH (41cc24 Further Benevity report fix on handling on formatted '0'.) -- To view, visit https://gerrit.wikimedia.org/r/338033 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I595b1ed6509882ce75cdd7df2eca06b1a29e9a55 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: deployment Gerrit-Owner: Eileen ___ 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' of https://gerrit.wikimedia.org/r/wiki...
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/338018 )
Change subject: Merge branch 'master' of
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
..
Merge branch 'master' of
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
9cb1bb1 Amount related fixes for Benevity import.
Change-Id: Icea23c9b61094314a1e1226157d4e48eeb518861
---
D sites/all/modules/offline2civicrm/tests/BenevityTest.php
D sites/all/modules/offline2civicrm/tests/data/benevity.csv
2 files changed, 0 insertions(+), 333 deletions(-)
Approvals:
jenkins-bot: Verified
Eileen: Looks good to me, approved
diff --git a/sites/all/modules/offline2civicrm/tests/BenevityTest.php
b/sites/all/modules/offline2civicrm/tests/BenevityTest.php
deleted file mode 100644
index 91fe22e..000
--- a/sites/all/modules/offline2civicrm/tests/BenevityTest.php
+++ /dev/null
@@ -1,325 +0,0 @@
-<<< HEAD (da6ba1 Merge branch 'master' into deployment)
-===
-epochtime = wmf_common_date_parse_string('2016-09-15');
-$this->setExchangeRates($this->epochtime, array('USD' => 1, 'BTC' => 3));
-$this->gateway = 'benevity';
-civicrm_initialize();
-CRM_Core_DAO::executeQuery("
- DELETE FROM civicrm_contribution
- WHERE trxn_id LIKE 'BENEVITY%'
-");
-CRM_Core_DAO::executeQuery("
- DELETE FROM civicrm_contact
- WHERE organization_name IN('Donald Duck Inc', 'Mickey Mouse Inc', 'Goofy
Inc', 'Uncle Scrooge Inc')
- OR nick_name IN('Donald Duck Inc', 'Mickey Mouse Inc', 'Goofy Inc',
'Uncle Scrooge Inc')
- OR first_name = 'Minnie' AND last_name = 'Mouse'
- OR first_name = 'Pluto'
-");
-$this->ensureAnonymousContactExists();
-\Civi::$statics = array();
-$countries = $this->callAPISuccess('Country', 'get', array());
-$this->callAPISuccess('Setting', 'create', array('countryLimit' =>
array_keys($countries['values'])));
-
- }
-
- /**
- * Make sure we have the anonymous contact - like the live DB.
- */
- protected function ensureAnonymousContactExists() {
-$anonymousParams = array(
- 'first_name' => 'Anonymous',
- 'last_name' => 'Anonymous',
- 'email' => 'fakeem...@wikimedia.org',
- 'contact_type' => 'Individual',
-);
-$contacts = $this->callAPISuccess('Contact', 'get', $anonymousParams);
-if ($contacts['count'] == 0) {
- $this->callAPISuccess('Contact', 'create', $anonymousParams);
-}
-$contacts = $this->callAPISuccess('Contact', 'get', $anonymousParams);
-$this->assertEquals(1, $contacts['count']);
- }
-
- /**
- * Test that all imports fail if the organization has multiple matches.
- */
- function testImportFailOrganizationContactAmbiguous() {
-$this->callAPISuccess('Contact', 'create', array('organization_name' =>
'Donald Duck Inc', 'contact_type' => 'Organization'));
-$this->callAPISuccess('Contact', 'create', array('organization_name' =>
'Donald Duck Inc', 'contact_type' => 'Organization'));
-$importer = new BenevityFile( __DIR__ . "/data/benevity.csv" );
-$importer->import();
-$messages = $importer->getMessages();
-$this->assertEquals('0 out of 4 rows were imported.', $messages['Result']);
- }
-
- /**
- * Test that all imports fail if the organization does not pre-exist.
- */
- function testImportFailNoOrganizationContactExists() {
-$importer = new BenevityFile( __DIR__ . "/data/benevity.csv" );
-$importer->import();
-$messages = $importer->getMessages();
-$this->assertEquals('0 out of 4 rows were imported.', $messages['Result']);
- }
-
- /**
- * Test that import passes for the contact if a single match is found.
- */
- function testImportSucceedOrganizationSingleContactExists() {
-$this->callAPISuccess('Contact', 'create', array('organization_name' =>
'Donald Duck Inc', 'contact_type' => 'Organization'));
-$importer = new BenevityFile( __DIR__ . "/data/benevity.csv" );
-$importer->import();
-$messages = $importer->getMessages();
-$this->assertEquals('1 out of 4 rows were imported.', $messages['Result']);
- }
-
- /**
- * Test that import passes for the Individual contact if a single match is
found.
- */
- function testImportSucceedIndividualSingleContactExists() {
-$thaMouseMeister = $this->callAPISuccess('Contact', 'create',
array('organization_name' => 'Mickey Mouse Inc', 'contact_type' =>
'Organization'));
-$minnie = $this->callAPISuccess('Contact', 'create', array(
- 'first_name' => 'Minnie', 'last_name' => 'Mouse', 'contact_type' =>
'Individual', 'email' => 'min...@mouse.org',
-));
-$importer = new BenevityFile( __DIR__ . "/data/benevity.csv" );
-$importer->import();
-$messages = $importer->getMessages();
-$this->assertEquals('1 out of 4 rows were imported.', $messages['Result']);
-$contributions = $this->callAPISuccess('Contribution
[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' of https://gerrit.wikimedia.org/r/wiki...
Eileen has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/338018 )
Change subject: Merge branch 'master' of
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
..
Merge branch 'master' of
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
9cb1bb1 Amount related fixes for Benevity import.
Change-Id: Icea23c9b61094314a1e1226157d4e48eeb518861
---
D sites/all/modules/offline2civicrm/tests/BenevityTest.php
D sites/all/modules/offline2civicrm/tests/data/benevity.csv
2 files changed, 0 insertions(+), 333 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm
refs/changes/18/338018/1
diff --git a/sites/all/modules/offline2civicrm/tests/BenevityTest.php
b/sites/all/modules/offline2civicrm/tests/BenevityTest.php
deleted file mode 100644
index 91fe22e..000
--- a/sites/all/modules/offline2civicrm/tests/BenevityTest.php
+++ /dev/null
@@ -1,325 +0,0 @@
-<<< HEAD (da6ba1 Merge branch 'master' into deployment)
-===
-epochtime = wmf_common_date_parse_string('2016-09-15');
-$this->setExchangeRates($this->epochtime, array('USD' => 1, 'BTC' => 3));
-$this->gateway = 'benevity';
-civicrm_initialize();
-CRM_Core_DAO::executeQuery("
- DELETE FROM civicrm_contribution
- WHERE trxn_id LIKE 'BENEVITY%'
-");
-CRM_Core_DAO::executeQuery("
- DELETE FROM civicrm_contact
- WHERE organization_name IN('Donald Duck Inc', 'Mickey Mouse Inc', 'Goofy
Inc', 'Uncle Scrooge Inc')
- OR nick_name IN('Donald Duck Inc', 'Mickey Mouse Inc', 'Goofy Inc',
'Uncle Scrooge Inc')
- OR first_name = 'Minnie' AND last_name = 'Mouse'
- OR first_name = 'Pluto'
-");
-$this->ensureAnonymousContactExists();
-\Civi::$statics = array();
-$countries = $this->callAPISuccess('Country', 'get', array());
-$this->callAPISuccess('Setting', 'create', array('countryLimit' =>
array_keys($countries['values'])));
-
- }
-
- /**
- * Make sure we have the anonymous contact - like the live DB.
- */
- protected function ensureAnonymousContactExists() {
-$anonymousParams = array(
- 'first_name' => 'Anonymous',
- 'last_name' => 'Anonymous',
- 'email' => 'fakeem...@wikimedia.org',
- 'contact_type' => 'Individual',
-);
-$contacts = $this->callAPISuccess('Contact', 'get', $anonymousParams);
-if ($contacts['count'] == 0) {
- $this->callAPISuccess('Contact', 'create', $anonymousParams);
-}
-$contacts = $this->callAPISuccess('Contact', 'get', $anonymousParams);
-$this->assertEquals(1, $contacts['count']);
- }
-
- /**
- * Test that all imports fail if the organization has multiple matches.
- */
- function testImportFailOrganizationContactAmbiguous() {
-$this->callAPISuccess('Contact', 'create', array('organization_name' =>
'Donald Duck Inc', 'contact_type' => 'Organization'));
-$this->callAPISuccess('Contact', 'create', array('organization_name' =>
'Donald Duck Inc', 'contact_type' => 'Organization'));
-$importer = new BenevityFile( __DIR__ . "/data/benevity.csv" );
-$importer->import();
-$messages = $importer->getMessages();
-$this->assertEquals('0 out of 4 rows were imported.', $messages['Result']);
- }
-
- /**
- * Test that all imports fail if the organization does not pre-exist.
- */
- function testImportFailNoOrganizationContactExists() {
-$importer = new BenevityFile( __DIR__ . "/data/benevity.csv" );
-$importer->import();
-$messages = $importer->getMessages();
-$this->assertEquals('0 out of 4 rows were imported.', $messages['Result']);
- }
-
- /**
- * Test that import passes for the contact if a single match is found.
- */
- function testImportSucceedOrganizationSingleContactExists() {
-$this->callAPISuccess('Contact', 'create', array('organization_name' =>
'Donald Duck Inc', 'contact_type' => 'Organization'));
-$importer = new BenevityFile( __DIR__ . "/data/benevity.csv" );
-$importer->import();
-$messages = $importer->getMessages();
-$this->assertEquals('1 out of 4 rows were imported.', $messages['Result']);
- }
-
- /**
- * Test that import passes for the Individual contact if a single match is
found.
- */
- function testImportSucceedIndividualSingleContactExists() {
-$thaMouseMeister = $this->callAPISuccess('Contact', 'create',
array('organization_name' => 'Mickey Mouse Inc', 'contact_type' =>
'Organization'));
-$minnie = $this->callAPISuccess('Contact', 'create', array(
- 'first_name' => 'Minnie', 'last_name' => 'Mouse', 'contact_type' =>
'Individual', 'email' => 'min...@mouse.org',
-));
-$importer = new BenevityFile( __DIR__ . "/data/benevity.csv" );
-$importer->import();
-$messages = $importer->getMessages();
-$this->assertEquals('1 out of 4 rows were imported.', $messages['Result']);
-$contributions = $this->callAPISuccess('Co
[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' of https://gerrit.wikimedia.org/r/wiki...
Eileen has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/337637 ) Change subject: Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment .. Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment 3e86651 Submodule update - (CiviCRM debug noise). Change-Id: Ie3c06e4876dee9010fe2f4e1f403057309458898 --- 0 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm refs/changes/37/337637/1 -- To view, visit https://gerrit.wikimedia.org/r/337637 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie3c06e4876dee9010fe2f4e1f403057309458898 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: deployment Gerrit-Owner: Eileen ___ 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' of https://gerrit.wikimedia.org/r/wiki...
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/337637 ) Change subject: Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment .. Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment 3e86651 Submodule update - (CiviCRM debug noise). Change-Id: Ie3c06e4876dee9010fe2f4e1f403057309458898 --- 0 files changed, 0 insertions(+), 0 deletions(-) Approvals: jenkins-bot: Verified Eileen: Looks good to me, approved -- To view, visit https://gerrit.wikimedia.org/r/337637 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie3c06e4876dee9010fe2f4e1f403057309458898 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: deployment Gerrit-Owner: Eileen Gerrit-Reviewer: Eileen 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' of https://gerrit.wikimedia.org/r/wiki...
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/337527 )
Change subject: Merge branch 'master' of
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
..
Merge branch 'master' of
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
Benevity import rollout.
f897198 Revert comment change.
835b317 Add tests for relationship creation.
43e5647 Fix Benevity import to only soft credit one way.
e3534a5 Fix Checks import to cope with commas.
b705e27 Pass more error details to calling function.
b1b3f4e Matching gifts import.
cb3a970 Git Ignore cache directory
Change-Id: Iaa508029e7d0d54691dbaefc0e340a868cc9f7af
---
D sites/all/modules/offline2civicrm/tests/BenevityTest.php
D sites/all/modules/offline2civicrm/tests/EngageChecksFileTest.php
D sites/all/modules/offline2civicrm/tests/data/benevity.csv
D sites/all/modules/offline2civicrm/tests/data/benevity_mice_no_email.csv
D sites/all/modules/offline2civicrm/tests/data/engage_multiple_errors.csv
D sites/all/modules/offline2civicrm/tests/data/engage_reduced.csv
D sites/all/modules/wmf_common/tests/includes/BaseWmfDrupalPhpUnitTestCase.php
7 files changed, 0 insertions(+), 818 deletions(-)
Approvals:
jenkins-bot: Verified
Eileen: Looks good to me, approved
diff --git a/sites/all/modules/offline2civicrm/tests/BenevityTest.php
b/sites/all/modules/offline2civicrm/tests/BenevityTest.php
deleted file mode 100644
index f104586..000
--- a/sites/all/modules/offline2civicrm/tests/BenevityTest.php
+++ /dev/null
@@ -1,320 +0,0 @@
-epochtime = wmf_common_date_parse_string('2016-09-15');
-$this->setExchangeRates($this->epochtime, array('USD' => 1, 'BTC' => 3));
-$this->gateway = 'benevity';
-civicrm_initialize();
-CRM_Core_DAO::executeQuery("
- DELETE FROM civicrm_contribution
- WHERE trxn_id LIKE 'BENEVITY%'
-");
-CRM_Core_DAO::executeQuery("
- DELETE FROM civicrm_contact
- WHERE organization_name IN('Donald Duck Inc', 'Mickey Mouse Inc', 'Goofy
Inc', 'Uncle Scrooge Inc')
- OR nick_name IN('Donald Duck Inc', 'Mickey Mouse Inc', 'Goofy Inc',
'Uncle Scrooge Inc')
- OR first_name = 'Minnie' AND last_name = 'Mouse'
- OR first_name = 'Pluto'
-");
-$this->ensureAnonymousContactExists();
-\Civi::$statics = array();
-$countries = $this->callAPISuccess('Country', 'get', array());
-$this->callAPISuccess('Setting', 'create', array('countryLimit' =>
array_keys($countries['values'])));
-
- }
-
- /**
- * Make sure we have the anonymous contact - like the live DB.
- */
- protected function ensureAnonymousContactExists() {
-$anonymousParams = array(
- 'first_name' => 'Anonymous',
- 'last_name' => 'Anonymous',
- 'email' => 'fakeem...@wikimedia.org',
- 'contact_type' => 'Individual',
-);
-$contacts = $this->callAPISuccess('Contact', 'get', $anonymousParams);
-if ($contacts['count'] == 0) {
- $this->callAPISuccess('Contact', 'create', $anonymousParams);
-}
-$contacts = $this->callAPISuccess('Contact', 'get', $anonymousParams);
-$this->assertEquals(1, $contacts['count']);
- }
-
- /**
- * Test that all imports fail if the organization has multiple matches.
- */
- function testImportFailOrganizationContactAmbiguous() {
-$this->callAPISuccess('Contact', 'create', array('organization_name' =>
'Donald Duck Inc', 'contact_type' => 'Organization'));
-$this->callAPISuccess('Contact', 'create', array('organization_name' =>
'Donald Duck Inc', 'contact_type' => 'Organization'));
-$importer = new BenevityFile( __DIR__ . "/data/benevity.csv" );
-$importer->import();
-$messages = $importer->getMessages();
-$this->assertEquals('0 out of 4 rows were imported.', $messages['Result']);
- }
-
- /**
- * Test that all imports fail if the organization does not pre-exist.
- */
- function testImportFailNoOrganizationContactExists() {
-$importer = new BenevityFile( __DIR__ . "/data/benevity.csv" );
-$importer->import();
-$messages = $importer->getMessages();
-$this->assertEquals('0 out of 4 rows were imported.', $messages['Result']);
- }
-
- /**
- * Test that import passes for the contact if a single match is found.
- */
- function testImportSucceedOrganizationSingleContactExists() {
-$this->callAPISuccess('Contact', 'create', array('organization_name' =>
'Donald Duck Inc', 'contact_type' => 'Organization'));
-$importer = new BenevityFile( __DIR__ . "/data/benevity.csv" );
-$importer->import();
-$messages = $importer->getMessages();
-$this->assertEquals('1 out of 4 rows were imported.', $messages['Result']);
- }
-
- /**
- * Test that import passes for the Individual contact if a single match is
found.
- */
- function testImportSucceedIndividualSingleContactExists() {
-$thaMouseMeister = $this->callAPISuccess('Contact', 'crea
[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' of https://gerrit.wikimedia.org/r/wiki...
Eileen has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/337527 )
Change subject: Merge branch 'master' of
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
..
Merge branch 'master' of
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
Benevity import rollout.
f897198 Revert comment change.
835b317 Add tests for relationship creation.
43e5647 Fix Benevity import to only soft credit one way.
e3534a5 Fix Checks import to cope with commas.
b705e27 Pass more error details to calling function.
b1b3f4e Matching gifts import.
cb3a970 Git Ignore cache directory
Change-Id: Iaa508029e7d0d54691dbaefc0e340a868cc9f7af
---
D sites/all/modules/offline2civicrm/tests/BenevityTest.php
D sites/all/modules/offline2civicrm/tests/EngageChecksFileTest.php
D sites/all/modules/offline2civicrm/tests/data/benevity.csv
D sites/all/modules/offline2civicrm/tests/data/benevity_mice_no_email.csv
D sites/all/modules/offline2civicrm/tests/data/engage_multiple_errors.csv
D sites/all/modules/offline2civicrm/tests/data/engage_reduced.csv
D sites/all/modules/wmf_common/tests/includes/BaseWmfDrupalPhpUnitTestCase.php
7 files changed, 0 insertions(+), 818 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm
refs/changes/27/337527/1
diff --git a/sites/all/modules/offline2civicrm/tests/BenevityTest.php
b/sites/all/modules/offline2civicrm/tests/BenevityTest.php
deleted file mode 100644
index f104586..000
--- a/sites/all/modules/offline2civicrm/tests/BenevityTest.php
+++ /dev/null
@@ -1,320 +0,0 @@
-epochtime = wmf_common_date_parse_string('2016-09-15');
-$this->setExchangeRates($this->epochtime, array('USD' => 1, 'BTC' => 3));
-$this->gateway = 'benevity';
-civicrm_initialize();
-CRM_Core_DAO::executeQuery("
- DELETE FROM civicrm_contribution
- WHERE trxn_id LIKE 'BENEVITY%'
-");
-CRM_Core_DAO::executeQuery("
- DELETE FROM civicrm_contact
- WHERE organization_name IN('Donald Duck Inc', 'Mickey Mouse Inc', 'Goofy
Inc', 'Uncle Scrooge Inc')
- OR nick_name IN('Donald Duck Inc', 'Mickey Mouse Inc', 'Goofy Inc',
'Uncle Scrooge Inc')
- OR first_name = 'Minnie' AND last_name = 'Mouse'
- OR first_name = 'Pluto'
-");
-$this->ensureAnonymousContactExists();
-\Civi::$statics = array();
-$countries = $this->callAPISuccess('Country', 'get', array());
-$this->callAPISuccess('Setting', 'create', array('countryLimit' =>
array_keys($countries['values'])));
-
- }
-
- /**
- * Make sure we have the anonymous contact - like the live DB.
- */
- protected function ensureAnonymousContactExists() {
-$anonymousParams = array(
- 'first_name' => 'Anonymous',
- 'last_name' => 'Anonymous',
- 'email' => 'fakeem...@wikimedia.org',
- 'contact_type' => 'Individual',
-);
-$contacts = $this->callAPISuccess('Contact', 'get', $anonymousParams);
-if ($contacts['count'] == 0) {
- $this->callAPISuccess('Contact', 'create', $anonymousParams);
-}
-$contacts = $this->callAPISuccess('Contact', 'get', $anonymousParams);
-$this->assertEquals(1, $contacts['count']);
- }
-
- /**
- * Test that all imports fail if the organization has multiple matches.
- */
- function testImportFailOrganizationContactAmbiguous() {
-$this->callAPISuccess('Contact', 'create', array('organization_name' =>
'Donald Duck Inc', 'contact_type' => 'Organization'));
-$this->callAPISuccess('Contact', 'create', array('organization_name' =>
'Donald Duck Inc', 'contact_type' => 'Organization'));
-$importer = new BenevityFile( __DIR__ . "/data/benevity.csv" );
-$importer->import();
-$messages = $importer->getMessages();
-$this->assertEquals('0 out of 4 rows were imported.', $messages['Result']);
- }
-
- /**
- * Test that all imports fail if the organization does not pre-exist.
- */
- function testImportFailNoOrganizationContactExists() {
-$importer = new BenevityFile( __DIR__ . "/data/benevity.csv" );
-$importer->import();
-$messages = $importer->getMessages();
-$this->assertEquals('0 out of 4 rows were imported.', $messages['Result']);
- }
-
- /**
- * Test that import passes for the contact if a single match is found.
- */
- function testImportSucceedOrganizationSingleContactExists() {
-$this->callAPISuccess('Contact', 'create', array('organization_name' =>
'Donald Duck Inc', 'contact_type' => 'Organization'));
-$importer = new BenevityFile( __DIR__ . "/data/benevity.csv" );
-$importer->import();
-$messages = $importer->getMessages();
-$this->assertEquals('1 out of 4 rows were imported.', $messages['Result']);
- }
-
- /**
- * Test that import passes for the Individual contact if a single match is
found.
- */
- function testImportSucceedIndividualSingleContactExists() {
-$thaMouseMeister = $this->callAPISuccess('Conta
[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' of https://gerrit.wikimedia.org/r/wiki...
Eileen has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/336481 ) Change subject: Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment .. Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment a6a960e CiviCRM submodule update a8d7789 CRM-19980, CRM-19881 - Fix slow queries due to LOWER on contact name fields 9bbf674 CRM-19811 fix contribution search to not use LOWER() on default fields (e.g. creditnote_id). Change-Id: I2883138234c9f74d7587c0316e309e65c116fcba --- 0 files changed, 0 insertions(+), 0 deletions(-) Approvals: jenkins-bot: Verified Eileen: Looks good to me, approved -- To view, visit https://gerrit.wikimedia.org/r/336481 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2883138234c9f74d7587c0316e309e65c116fcba Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: deployment Gerrit-Owner: Eileen Gerrit-Reviewer: Eileen 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' of https://gerrit.wikimedia.org/r/wiki...
Eileen has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/336481 ) Change subject: Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment .. Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment a6a960e CiviCRM submodule update a8d7789 CRM-19980, CRM-19881 - Fix slow queries due to LOWER on contact name fields 9bbf674 CRM-19811 fix contribution search to not use LOWER() on default fields (e.g. creditnote_id). Change-Id: I2883138234c9f74d7587c0316e309e65c116fcba --- 0 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm refs/changes/81/336481/1 -- To view, visit https://gerrit.wikimedia.org/r/336481 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2883138234c9f74d7587c0316e309e65c116fcba Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: deployment Gerrit-Owner: Eileen ___ 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' of https://gerrit.wikimedia.org/r/wiki...
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/336469 ) Change subject: Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment .. Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment 7b287e6 Fix datachecks extension. Change-Id: If07aa25050f9adad1395611799eeb325f29d7ecf --- 0 files changed, 0 insertions(+), 0 deletions(-) Approvals: jenkins-bot: Verified Eileen: Looks good to me, approved -- To view, visit https://gerrit.wikimedia.org/r/336469 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If07aa25050f9adad1395611799eeb325f29d7ecf Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: deployment Gerrit-Owner: Eileen Gerrit-Reviewer: Eileen 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' of https://gerrit.wikimedia.org/r/wiki...
Eileen has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/336469 ) Change subject: Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment .. Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment 7b287e6 Fix datachecks extension. Change-Id: If07aa25050f9adad1395611799eeb325f29d7ecf --- 0 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm refs/changes/69/336469/1 -- To view, visit https://gerrit.wikimedia.org/r/336469 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If07aa25050f9adad1395611799eeb325f29d7ecf Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: deployment Gerrit-Owner: Eileen ___ 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' of https://gerrit.wikimedia.org/r/wiki...
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/335589 ) Change subject: Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment .. Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment f18bcde Add index to activity_date_time column Change-Id: I5c2f1385eb2122d12b6f69ce7892916d4c19ee44 --- 0 files changed, 0 insertions(+), 0 deletions(-) Approvals: jenkins-bot: Verified Eileen: Looks good to me, approved -- To view, visit https://gerrit.wikimedia.org/r/335589 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5c2f1385eb2122d12b6f69ce7892916d4c19ee44 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: deployment Gerrit-Owner: Eileen Gerrit-Reviewer: Eileen 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' of https://gerrit.wikimedia.org/r/wiki...
Eileen has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/335589 ) Change subject: Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment .. Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment f18bcde Add index to activity_date_time column Change-Id: I5c2f1385eb2122d12b6f69ce7892916d4c19ee44 --- 0 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm refs/changes/89/335589/1 -- To view, visit https://gerrit.wikimedia.org/r/335589 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5c2f1385eb2122d12b6f69ce7892916d4c19ee44 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: deployment Gerrit-Owner: Eileen ___ 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' of https://gerrit.wikimedia.org/r/wiki...
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/335583 ) Change subject: Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment .. Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment c6dceac23aad1bc071f1f41b32e256c6a104bdd2 Add missing module message fixer module. 7331a8ab1305ddd57a85ccdc0ce8d88eef995256 Update drupal to 7.5.2 1a5eb6762eca0e4559ff111eef27696887d54cbf Add datachecks extension. Change-Id: I8c53105cd33852545fa4bac42ac624533452b0c0 --- 0 files changed, 0 insertions(+), 0 deletions(-) Approvals: jenkins-bot: Verified Eileen: Looks good to me, approved -- To view, visit https://gerrit.wikimedia.org/r/335583 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8c53105cd33852545fa4bac42ac624533452b0c0 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: deployment Gerrit-Owner: Eileen Gerrit-Reviewer: Eileen 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' of https://gerrit.wikimedia.org/r/wiki...
Eileen has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/335583 ) Change subject: Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment .. Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment c6dceac23aad1bc071f1f41b32e256c6a104bdd2 Add missing module message fixer module. 7331a8ab1305ddd57a85ccdc0ce8d88eef995256 Update drupal to 7.5.2 1a5eb6762eca0e4559ff111eef27696887d54cbf Add datachecks extension. Change-Id: I8c53105cd33852545fa4bac42ac624533452b0c0 --- 0 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm refs/changes/83/335583/1 -- To view, visit https://gerrit.wikimedia.org/r/335583 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8c53105cd33852545fa4bac42ac624533452b0c0 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: deployment Gerrit-Owner: Eileen ___ 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' of https://gerrit.wikimedia.org/r/wiki...
Eileen has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/335159 ) Change subject: Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment .. Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment 7331a8a Update drupal to 7.5.2 c6dceac Add missing module message fixer module. Bug: T143268 Change-Id: I544d4fd237c393a96be3714e81075b9216bafffa --- 0 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm refs/changes/59/335159/1 -- To view, visit https://gerrit.wikimedia.org/r/335159 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I544d4fd237c393a96be3714e81075b9216bafffa Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: deployment Gerrit-Owner: Eileen ___ 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' of https://gerrit.wikimedia.org/r/wiki...
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/335088 )
Change subject: Merge branch 'master' of
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
..
Merge branch 'master' of
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
3d77c71 Add index to nick_name field.
ea06847 Merge "Fix missing ct_id recovery"
Change-Id: Ifb3abdb1b0b43f57601ca2c2c4854fb6e9d440eb
---
D sites/all/modules/recurring_globalcollect/tests/RecurringGlobalCollectTest.php
1 file changed, 0 insertions(+), 210 deletions(-)
Approvals:
jenkins-bot: Verified
Eileen: 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 a569bb5..000
---
a/sites/all/modules/recurring_globalcollect/tests/RecurringGlobalCollectTest.php
+++ /dev/null
@@ -1,210 +0,0 @@
-<<< HEAD (6b6f5d 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'];
- wmf_civicrm_insert_contribution_tracking( '..rcc', 'civicrm',
null, wmf_common_date_unix_to_sql( strtotime( 'now' ) ), $result['id'] );
- }
-
- 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' => mt_rand(),
- 'amount' => '2345',
- 'effort_id' => 2,
- 'order_id' => '9998890004',
- 'currency_code' => 'EUR',
- 'payment_product' => '',
- );
- $gateway = DonationInterfaceFactory::createAdapter(
'globalcollect', $init );
-
- $gateway->setDummyGatewayResponseCode( 'recurrin
[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' of https://gerrit.wikimedia.org/r/wiki...
Eileen has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/335088 )
Change subject: Merge branch 'master' of
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
..
Merge branch 'master' of
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
3d77c71 Add index to nick_name field.
ea06847 Merge "Fix missing ct_id recovery"
Change-Id: Ifb3abdb1b0b43f57601ca2c2c4854fb6e9d440eb
---
D sites/all/modules/recurring_globalcollect/tests/RecurringGlobalCollectTest.php
1 file changed, 0 insertions(+), 210 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm
refs/changes/88/335088/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 a569bb5..000
---
a/sites/all/modules/recurring_globalcollect/tests/RecurringGlobalCollectTest.php
+++ /dev/null
@@ -1,210 +0,0 @@
-<<< HEAD (6b6f5d 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'];
- wmf_civicrm_insert_contribution_tracking( '..rcc', 'civicrm',
null, wmf_common_date_unix_to_sql( strtotime( 'now' ) ), $result['id'] );
- }
-
- 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' => mt_rand(),
- 'amount' => '2345',
- 'effort_id' => 2,
- 'order_id' => '9998890004',
- 'currency_code' => 'EUR',
- 'payment_product' => '',
- );
- $gateway = DonationInterfaceFactory::createAdapter(
'globalcollect', $init );
-
- $gateway->setDummyGatewayResponseCode(
[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' of https://gerrit.wikimedia.org/r/wiki...
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/331546 )
Change subject: Merge branch 'master' of
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
..
Merge branch 'master' of
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
614c594cd47c1817693397550a72827fe200db6d Remove code tagging of contacts for
Review.
6e7b26212a067b3d3305dcf4f8d800f6d15c4d6a Remove entity tags for 'Review'.
8eff058dbada41454d4af6f47fa0ea8c4ebcd0e5 Add small extension to mark dead
contacts as opted out.
2873388266df8bd22e782a95b707f6da20e1f5f4 Little cleanups to large donation
notifier
Change-Id: I3f3f1021df302a3c041c4efbb0191c35463f5fab
---
D sites/all/modules/wmf_civicrm/tests/phpunit/HelperFunctionsTest.php
1 file changed, 0 insertions(+), 83 deletions(-)
Approvals:
jenkins-bot: Verified
Eileen: Looks good to me, approved
diff --git
a/sites/all/modules/wmf_civicrm/tests/phpunit/HelperFunctionsTest.php
b/sites/all/modules/wmf_civicrm/tests/phpunit/HelperFunctionsTest.php
deleted file mode 100644
index fda6717..000
--- a/sites/all/modules/wmf_civicrm/tests/phpunit/HelperFunctionsTest.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<<< HEAD (ce95e5 Little cleanups to large donation notifier)
-===
- 'languages',
-'name' => 'en_IL',
-));
-$this->assertEquals(1, $languages['count']);
-}
-
-/**
- * Test wmf custom api entity get detail.
- *
- * @todo consider moving test to thank_you module or helper function out
of there.
- *
- * @throws \CiviCRM_API3_Exception
- */
-public function testGetEntityTagDetail() {
-civicrm_initialize();
-$contact = $this->callAPISuccess('Contact', 'create', array(
-'first_name' => 'Papa',
-'last_name' => 'Smurf',
-'contact_type' => 'Individual',
-));
-$contribution = $this->callAPISuccess('Contribution', 'create', array(
-'contact_id' => $contact['id'],
-'total_amount' => 40,
-'financial_type_id' => 'Donation',
-));
-
-$tag1 = $this->ensureTagExists('smurfy');
-$tag2 = $this->ensureTagExists('smurfalicious');
-
-$this->callAPISuccess('EntityTag', 'create', array('entity_id' =>
$contribution['id'], 'entity_table' => 'civicrm_contribution', 'tag_id' =>
'smurfy'));
-$this->callAPISuccess('EntityTag', 'create', array('entity_id' =>
$contribution['id'], 'entity_table' => 'civicrm_contribution', 'tag_id' =>
'smurfalicious'));
-
-$smurfiestTags = wmf_thank_you_get_tag_names($contribution['id']);
-$this->assertEquals(array('smurfy', 'smurfalicious'), $smurfiestTags);
-
-$this->callAPISuccess('Tag', 'delete', array('id' => $tag1));
-$this->callAPISuccess('Tag', 'delete', array('id' => $tag2));
-}
-
-/**
- * Helper function to protect test against cleanup issues.
- *
- * @param string $name
- * @return int
- */
-public function ensureTagExists($name) {
-$tags = $this->callAPISuccess('EntityTag', 'getoptions', array('field'
=> 'tag_id'));
-if (in_array($name, $tags['values'])) {
-return array_search($name, $tags['values']);
-}
-$tag = $this->callAPISuccess('Tag', 'create', array(
-'used_for' => 'civicrm_contribution',
-'name' => $name
-));
-$this->callAPISuccess('Tag', 'getfields', array('cache_clear' => 1));
-return $tag['id'];
-}
-
-}
->>> BRANCH (287338 Little cleanups to large donation notifier)
--
To view, visit https://gerrit.wikimedia.org/r/331546
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3f3f1021df302a3c041c4efbb0191c35463f5fab
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Eileen
Gerrit-Reviewer: Eileen
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' of https://gerrit.wikimedia.org/r/wiki...
Eileen has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/331546 )
Change subject: Merge branch 'master' of
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
..
Merge branch 'master' of
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
614c594cd47c1817693397550a72827fe200db6d Remove code tagging of contacts for
Review.
6e7b26212a067b3d3305dcf4f8d800f6d15c4d6a Remove entity tags for 'Review'.
8eff058dbada41454d4af6f47fa0ea8c4ebcd0e5 Add small extension to mark dead
contacts as opted out.
2873388266df8bd22e782a95b707f6da20e1f5f4 Little cleanups to large donation
notifier
Change-Id: I3f3f1021df302a3c041c4efbb0191c35463f5fab
---
D sites/all/modules/wmf_civicrm/tests/phpunit/HelperFunctionsTest.php
1 file changed, 0 insertions(+), 83 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm
refs/changes/46/331546/1
diff --git
a/sites/all/modules/wmf_civicrm/tests/phpunit/HelperFunctionsTest.php
b/sites/all/modules/wmf_civicrm/tests/phpunit/HelperFunctionsTest.php
deleted file mode 100644
index fda6717..000
--- a/sites/all/modules/wmf_civicrm/tests/phpunit/HelperFunctionsTest.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<<< HEAD (ce95e5 Little cleanups to large donation notifier)
-===
- 'languages',
-'name' => 'en_IL',
-));
-$this->assertEquals(1, $languages['count']);
-}
-
-/**
- * Test wmf custom api entity get detail.
- *
- * @todo consider moving test to thank_you module or helper function out
of there.
- *
- * @throws \CiviCRM_API3_Exception
- */
-public function testGetEntityTagDetail() {
-civicrm_initialize();
-$contact = $this->callAPISuccess('Contact', 'create', array(
-'first_name' => 'Papa',
-'last_name' => 'Smurf',
-'contact_type' => 'Individual',
-));
-$contribution = $this->callAPISuccess('Contribution', 'create', array(
-'contact_id' => $contact['id'],
-'total_amount' => 40,
-'financial_type_id' => 'Donation',
-));
-
-$tag1 = $this->ensureTagExists('smurfy');
-$tag2 = $this->ensureTagExists('smurfalicious');
-
-$this->callAPISuccess('EntityTag', 'create', array('entity_id' =>
$contribution['id'], 'entity_table' => 'civicrm_contribution', 'tag_id' =>
'smurfy'));
-$this->callAPISuccess('EntityTag', 'create', array('entity_id' =>
$contribution['id'], 'entity_table' => 'civicrm_contribution', 'tag_id' =>
'smurfalicious'));
-
-$smurfiestTags = wmf_thank_you_get_tag_names($contribution['id']);
-$this->assertEquals(array('smurfy', 'smurfalicious'), $smurfiestTags);
-
-$this->callAPISuccess('Tag', 'delete', array('id' => $tag1));
-$this->callAPISuccess('Tag', 'delete', array('id' => $tag2));
-}
-
-/**
- * Helper function to protect test against cleanup issues.
- *
- * @param string $name
- * @return int
- */
-public function ensureTagExists($name) {
-$tags = $this->callAPISuccess('EntityTag', 'getoptions', array('field'
=> 'tag_id'));
-if (in_array($name, $tags['values'])) {
-return array_search($name, $tags['values']);
-}
-$tag = $this->callAPISuccess('Tag', 'create', array(
-'used_for' => 'civicrm_contribution',
-'name' => $name
-));
-$this->callAPISuccess('Tag', 'getfields', array('cache_clear' => 1));
-return $tag['id'];
-}
-
-}
->>> BRANCH (287338 Little cleanups to large donation notifier)
--
To view, visit https://gerrit.wikimedia.org/r/331546
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3f3f1021df302a3c041c4efbb0191c35463f5fab
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Eileen
___
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' of https://gerrit.wikimedia.org/r/wiki...
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/330330 )
Change subject: Merge branch 'master' of
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
..
Merge branch 'master' of
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
+ 03c978647c5fc7f2fe45d19ed63013010c199665 Quick fix for drush dpm
+ 2466cf393e8ff95420869106e5b1afdd268d4e28 Create & use location update
function in the scenarios where we are updating.
+ 46e8202346be8113b7e4ee03c5f0e11d6f1957f3 Update PHPmailer for CVE-2016-10045
and CVE-2016-10033
+ 2ecaa2ace1bcd4b504fd79584ff784f1eb3b4084 Alter test to accomodate minor
format change in master.
+ 9dd75bc1b3c8c926bc1d539e8c46d93f6a6ebb72 Do not write address to the database
if all data is empty.
+ 286db02dab0dcc354e650296efb8f62f34ee6968 Consolidate test data into one
directory.
+ fe041629f5dc815c9de17c6b5088e99fc28acff8 Consolidate test cleanup routine
into parent class
+ e4893eaed91af8aa31e3ddf30d163fb2a88bcb55 Add preliminary CoinBase Test.
+ 021ec65077abf0cc0fb749508a4d017847968829 Remove duplicate field in import
fields array.
+ 40b8bd0a9cbef85b37d6620651fe9f4ad64b32ad Fix test that was not running to run.
+ ac586fe3cb7051272ae32bb8cee3d1754d657a10 Revert "Update PHPmailer for
CVE-2016-10045 and CVE-2016-10033"
+ 4e5852563d51613a8c33a46d6215c7832f26e0b4 Add support for importing campaign
source, medium for CoinBase.
+ 768b0e9f9d859e37eb51e8eab4170ccbc4858ee8 Pull composer changes from deployment
Change-Id: Id3f03cc25c78be8a0c3efbb13ea8dba8d5ce5015
---
D sites/all/modules/offline2civicrm/tests/CoinBaseTest.php
D sites/all/modules/offline2civicrm/tests/ContributionConversionTest.php
D sites/all/modules/offline2civicrm/tests/EngageChecksFileTest.php
D sites/all/modules/offline2civicrm/tests/JpMorganFileTest.php
D sites/all/modules/offline2civicrm/tests/data/coinbase.csv
D sites/all/modules/offline2civicrm/tests/data/engage.csv
D sites/all/modules/offline2civicrm/tests/data/engage_postal.csv
D sites/all/modules/offline2civicrm/tests/data/engage_reduced.csv
D sites/all/modules/offline2civicrm/tests/includes/BaseChecksFileTest.php
D sites/all/modules/queue2civicrm/tests/phpunit/ProcessMessageTest.php
D sites/all/modules/wmf_civicrm/tests/phpunit/HelperFunctionsTest.php
11 files changed, 0 insertions(+), 1,163 deletions(-)
Approvals:
jenkins-bot: Verified
Eileen: Looks good to me, approved
diff --git a/sites/all/modules/offline2civicrm/tests/CoinBaseTest.php
b/sites/all/modules/offline2civicrm/tests/CoinBaseTest.php
deleted file mode 100644
index e7f9f78..000
--- a/sites/all/modules/offline2civicrm/tests/CoinBaseTest.php
+++ /dev/null
@@ -1,32 +0,0 @@
-epochtime = wmf_common_date_parse_string('2016-09-15');
-$this->setExchangeRates($this->epochtime, array('USD' => 1, 'BTC' =>
3));
-$this->gateway = 'coinbase';
-}
-
-function testImport() {
-civicrm_initialize();
-$this->trxn_id = 'Pluto';
-$this->doCleanUp();
-
-$importer = new CoinbaseFile( __DIR__ . "/data/coinbase.csv" );
-$importer->import();
-
-$contribution =
wmf_civicrm_get_contributions_from_gateway_id($this->gateway, $this->trxn_id);
-$this->assertEquals(1, count($contribution));
-$this->assertEquals('COINBASE PLUTO', $contribution[0]['trxn_id']);
-$this->assertEquals('online', db_query("SELECT {utm_medium} from
{contribution_tracking} WHERE contribution_id =
{$contribution[0]['id']}")->fetchField());
-}
-
-}
diff --git
a/sites/all/modules/offline2civicrm/tests/ContributionConversionTest.php
b/sites/all/modules/offline2civicrm/tests/ContributionConversionTest.php
deleted file mode 100644
index da00108..000
--- a/sites/all/modules/offline2civicrm/tests/ContributionConversionTest.php
+++ /dev/null
@@ -1,68 +0,0 @@
-callAPISuccess('Contact', 'create', array(
-'contact_type' => 'Individual',
-'email' => 'f...@example.com',
-));
-$this->contact_id = $result['id'];
-
-$this->gateway_txn_id = "NaN-" . mt_rand();
-$this->transaction = WmfTransaction::from_unique_id( "GLOBALCOLLECT
{$this->gateway_txn_id}" );
-
-$contributionResult = $this->callAPISuccess('Contribution', 'create',
array(
-'contact_id' => $this->contact_id,
-'trxn_id' => $this->transaction->get_unique_id(),
-'contribution_type' => 'Cash',
-'total_amount' => '20.01',
-'receive_date' => wmf_common_date_unix_to_sql( time() ),
-));
-$this->contribution_id = $contributionResult['id'];
-
-wmf_civicrm_set_custom_field_values($this->contribution_id, array(
-'original_amount' => '20.01',
-'original_currency' => 'USD',
-));
-}
-
-public function tearDown() {
-parent::tearDown();
-$this->callAPISuccess(
[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' of https://gerrit.wikimedia.org/r/wiki...
Eileen has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/330330 )
Change subject: Merge branch 'master' of
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
..
Merge branch 'master' of
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
+ 03c978647c5fc7f2fe45d19ed63013010c199665 Quick fix for drush dpm
+ 2466cf393e8ff95420869106e5b1afdd268d4e28 Create & use location update
function in the scenarios where we are updating.
+ 46e8202346be8113b7e4ee03c5f0e11d6f1957f3 Update PHPmailer for CVE-2016-10045
and CVE-2016-10033
+ 2ecaa2ace1bcd4b504fd79584ff784f1eb3b4084 Alter test to accomodate minor
format change in master.
+ 9dd75bc1b3c8c926bc1d539e8c46d93f6a6ebb72 Do not write address to the database
if all data is empty.
+ 286db02dab0dcc354e650296efb8f62f34ee6968 Consolidate test data into one
directory.
+ fe041629f5dc815c9de17c6b5088e99fc28acff8 Consolidate test cleanup routine
into parent class
+ e4893eaed91af8aa31e3ddf30d163fb2a88bcb55 Add preliminary CoinBase Test.
+ 021ec65077abf0cc0fb749508a4d017847968829 Remove duplicate field in import
fields array.
+ 40b8bd0a9cbef85b37d6620651fe9f4ad64b32ad Fix test that was not running to run.
+ ac586fe3cb7051272ae32bb8cee3d1754d657a10 Revert "Update PHPmailer for
CVE-2016-10045 and CVE-2016-10033"
+ 4e5852563d51613a8c33a46d6215c7832f26e0b4 Add support for importing campaign
source, medium for CoinBase.
+ 768b0e9f9d859e37eb51e8eab4170ccbc4858ee8 Pull composer changes from deployment
Change-Id: Id3f03cc25c78be8a0c3efbb13ea8dba8d5ce5015
---
D sites/all/modules/offline2civicrm/tests/CoinBaseTest.php
D sites/all/modules/offline2civicrm/tests/ContributionConversionTest.php
D sites/all/modules/offline2civicrm/tests/EngageChecksFileTest.php
D sites/all/modules/offline2civicrm/tests/JpMorganFileTest.php
D sites/all/modules/offline2civicrm/tests/data/coinbase.csv
D sites/all/modules/offline2civicrm/tests/data/engage.csv
D sites/all/modules/offline2civicrm/tests/data/engage_postal.csv
D sites/all/modules/offline2civicrm/tests/data/engage_reduced.csv
D sites/all/modules/offline2civicrm/tests/includes/BaseChecksFileTest.php
D sites/all/modules/queue2civicrm/tests/phpunit/ProcessMessageTest.php
D sites/all/modules/wmf_civicrm/tests/phpunit/HelperFunctionsTest.php
11 files changed, 0 insertions(+), 1,163 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm
refs/changes/30/330330/1
diff --git a/sites/all/modules/offline2civicrm/tests/CoinBaseTest.php
b/sites/all/modules/offline2civicrm/tests/CoinBaseTest.php
deleted file mode 100644
index e7f9f78..000
--- a/sites/all/modules/offline2civicrm/tests/CoinBaseTest.php
+++ /dev/null
@@ -1,32 +0,0 @@
-epochtime = wmf_common_date_parse_string('2016-09-15');
-$this->setExchangeRates($this->epochtime, array('USD' => 1, 'BTC' =>
3));
-$this->gateway = 'coinbase';
-}
-
-function testImport() {
-civicrm_initialize();
-$this->trxn_id = 'Pluto';
-$this->doCleanUp();
-
-$importer = new CoinbaseFile( __DIR__ . "/data/coinbase.csv" );
-$importer->import();
-
-$contribution =
wmf_civicrm_get_contributions_from_gateway_id($this->gateway, $this->trxn_id);
-$this->assertEquals(1, count($contribution));
-$this->assertEquals('COINBASE PLUTO', $contribution[0]['trxn_id']);
-$this->assertEquals('online', db_query("SELECT {utm_medium} from
{contribution_tracking} WHERE contribution_id =
{$contribution[0]['id']}")->fetchField());
-}
-
-}
diff --git
a/sites/all/modules/offline2civicrm/tests/ContributionConversionTest.php
b/sites/all/modules/offline2civicrm/tests/ContributionConversionTest.php
deleted file mode 100644
index da00108..000
--- a/sites/all/modules/offline2civicrm/tests/ContributionConversionTest.php
+++ /dev/null
@@ -1,68 +0,0 @@
-callAPISuccess('Contact', 'create', array(
-'contact_type' => 'Individual',
-'email' => 'f...@example.com',
-));
-$this->contact_id = $result['id'];
-
-$this->gateway_txn_id = "NaN-" . mt_rand();
-$this->transaction = WmfTransaction::from_unique_id( "GLOBALCOLLECT
{$this->gateway_txn_id}" );
-
-$contributionResult = $this->callAPISuccess('Contribution', 'create',
array(
-'contact_id' => $this->contact_id,
-'trxn_id' => $this->transaction->get_unique_id(),
-'contribution_type' => 'Cash',
-'total_amount' => '20.01',
-'receive_date' => wmf_common_date_unix_to_sql( time() ),
-));
-$this->contribution_id = $contributionResult['id'];
-
-wmf_civicrm_set_custom_field_values($this->contribution_id, array(
-'original_amount' => '20.01',
-'original_currency' => 'USD',
-));
-}
-
-public function tearDown() {
-parent::tearDown();
-$this->callA
[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' of https://gerrit.wikimedia.org/r/wiki...
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/327146 ) Change subject: Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment .. Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment 7ebfe88 Update unsubscribe so that email is required 91b0f0c Update unsubscribe extension to differentiate between opted out & already opted out cddd074 Fix unsubscribe screen to hide results when data changes. Change-Id: I9258b079184bd82d91504eec74a29db1820abed1 --- 0 files changed, 0 insertions(+), 0 deletions(-) Approvals: jenkins-bot: Verified Eileen: Looks good to me, approved -- To view, visit https://gerrit.wikimedia.org/r/327146 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9258b079184bd82d91504eec74a29db1820abed1 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: deployment Gerrit-Owner: Eileen Gerrit-Reviewer: Eileen 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' of https://gerrit.wikimedia.org/r/wiki...
Eileen has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/327146 ) Change subject: Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment .. Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment 7ebfe88 Update unsubscribe so that email is required 91b0f0c Update unsubscribe extension to differentiate between opted out & already opted out cddd074 Fix unsubscribe screen to hide results when data changes. Change-Id: I9258b079184bd82d91504eec74a29db1820abed1 --- 0 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm refs/changes/46/327146/1 -- To view, visit https://gerrit.wikimedia.org/r/327146 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9258b079184bd82d91504eec74a29db1820abed1 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: deployment Gerrit-Owner: Eileen ___ 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' of https://gerrit.wikimedia.org/r/wiki...
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/327093 ) Change subject: Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment .. Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment 18a5a6c5b5 CiviCRM submodule update 6dae94d CRM-19752 Fix slow query on contribution dash Change-Id: I3d41baee33d51a048ff6325295eaf25de2265a3a --- 0 files changed, 0 insertions(+), 0 deletions(-) Approvals: jenkins-bot: Verified Eileen: Looks good to me, approved -- To view, visit https://gerrit.wikimedia.org/r/327093 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3d41baee33d51a048ff6325295eaf25de2265a3a Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: deployment Gerrit-Owner: Eileen Gerrit-Reviewer: Eileen 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' of https://gerrit.wikimedia.org/r/wiki...
Eileen has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/327093 ) Change subject: Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment .. Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment 18a5a6c5b5 CiviCRM submodule update 6dae94d CRM-19752 Fix slow query on contribution dash Change-Id: I3d41baee33d51a048ff6325295eaf25de2265a3a --- 0 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm refs/changes/93/327093/1 -- To view, visit https://gerrit.wikimedia.org/r/327093 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3d41baee33d51a048ff6325295eaf25de2265a3a Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: deployment Gerrit-Owner: Eileen ___ 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' of https://gerrit.wikimedia.org/r/wiki...
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/327037 ) Change subject: Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment .. Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment c293fba CiviCRM submodule update - speed fix of contribution search query Change-Id: I7b480229840e2e0205fa2afbbeeb487b33cc5692 --- 0 files changed, 0 insertions(+), 0 deletions(-) Approvals: jenkins-bot: Verified Eileen: Looks good to me, approved -- To view, visit https://gerrit.wikimedia.org/r/327037 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7b480229840e2e0205fa2afbbeeb487b33cc5692 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: deployment Gerrit-Owner: Eileen Gerrit-Reviewer: Eileen 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' of https://gerrit.wikimedia.org/r/wiki...
Eileen has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/327037 ) Change subject: Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment .. Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment c293fba CiviCRM submodule update - speed fix of contribution search query Change-Id: I7b480229840e2e0205fa2afbbeeb487b33cc5692 --- 0 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm refs/changes/37/327037/1 -- To view, visit https://gerrit.wikimedia.org/r/327037 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7b480229840e2e0205fa2afbbeeb487b33cc5692 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: deployment Gerrit-Owner: Eileen ___ 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' of https://gerrit.wikimedia.org/r/wiki...
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/326838 ) Change subject: Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment .. Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment 64ad5b3 Fix typos in unsubscribe extension a696034 Add extension with screen to do data entry on unsubscribing emails. Change-Id: I49c4471cfc354047dc6cdcc67d7b20084e14da5e --- 0 files changed, 0 insertions(+), 0 deletions(-) Approvals: jenkins-bot: Verified Eileen: Looks good to me, approved -- To view, visit https://gerrit.wikimedia.org/r/326838 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I49c4471cfc354047dc6cdcc67d7b20084e14da5e Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: deployment Gerrit-Owner: Eileen Gerrit-Reviewer: Eileen 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' of https://gerrit.wikimedia.org/r/wiki...
Eileen has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/326838 ) Change subject: Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment .. Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment 64ad5b3 Fix typos in unsubscribe extension a696034 Add extension with screen to do data entry on unsubscribing emails. Change-Id: I49c4471cfc354047dc6cdcc67d7b20084e14da5e --- 0 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm refs/changes/38/326838/1 -- To view, visit https://gerrit.wikimedia.org/r/326838 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I49c4471cfc354047dc6cdcc67d7b20084e14da5e Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: deployment Gerrit-Owner: Eileen ___ 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' of https://gerrit.wikimedia.org/r/wiki...
Eileen has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/326837 ) Change subject: Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment .. Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment 64ad5b3 Fix typos in unsubscribe extension Change-Id: I35246797003e5e9c1b2bab4646eb637a4cdad6df --- 0 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm refs/changes/37/326837/1 -- To view, visit https://gerrit.wikimedia.org/r/326837 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I35246797003e5e9c1b2bab4646eb637a4cdad6df Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: deployment Gerrit-Owner: Eileen ___ 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' of https://gerrit.wikimedia.org/r/wiki...
Eileen has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/326835 ) Change subject: Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment .. Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment a696034c7ac40467d3b2e89351256e2e3e2e1d60 Add extension with screen to do data entry on unsubscribing emails. Change-Id: I435f7bccd690d40cac671194681b7412f4837a32 --- 0 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm refs/changes/35/326835/1 -- To view, visit https://gerrit.wikimedia.org/r/326835 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I435f7bccd690d40cac671194681b7412f4837a32 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: deployment Gerrit-Owner: Eileen ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
