[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' of ssh://gerrit.wikimedia.org:29418/wi...
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/404682 ) Change subject: Merge branch 'master' of ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm into deployment .. Merge branch 'master' of ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm into deployment a47c16f Restored `composer test` script 6f03194 DonationStats now tracking average processing times abfae19 CiviCRM submodule update 356b429 Add Citibank International to payment instruments on new installs. 97f582f Re-save any contacts without a display name. 69fdda3 Add extension to change contact types a8d515d Update CiviCRM submodule f4821dc Added DonationStatsCollector class to record stats across Donation Queue Consumer. Change-Id: Idd51fbd22966b9f79bff0bcfb25ff5acaeb1189c --- D phpunit.xml D sites/all/modules/queue2civicrm/tests/phpunit/DonationStatsCollectorTest.php 2 files changed, 0 insertions(+), 450 deletions(-) Approvals: Jgleeson: Looks good to me, approved jenkins-bot: Verified diff --git a/phpunit.xml b/phpunit.xml deleted file mode 100644 index 3204b23..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 (f4821d Added DonationStatsCollector class to record stats across Do) diff --git a/sites/all/modules/queue2civicrm/tests/phpunit/DonationStatsCollectorTest.php b/sites/all/modules/queue2civicrm/tests/phpunit/DonationStatsCollectorTest.php deleted file mode 100644 index 9cdd2c4..000 --- a/sites/all/modules/queue2civicrm/tests/phpunit/DonationStatsCollectorTest.php +++ /dev/null @@ -1,391 +0,0 @@ -donationStatsCollector = $this->getTestDonationStatsCollectorInstance(); - } - - /** - * @dataProvider singleDummyDonationDataProvider - */ - public function testCanRecordSingleDonationStat($message, $contribution) { -$contribution['receive_date'] = \SmashPig\Core\UtcDate::getUtcDatabaseString($contribution['receive_date']); - -$this->donationStatsCollector->recordDonationStats($message, $contribution); - -$recordedStats = $this->donationStatsCollector->getAllStats(); - -$expected = [ - 'test_namespace.count' => ['ACME_PAYMENTS' => 1], - 'test_namespace.transaction_age' => ['ACME_PAYMENTS' => 3600], // 1 hour -]; - -$this->assertEquals($expected, $recordedStats); - } - - /** - * @dataProvider singleDummyDonationDataProvider - */ - public function testCanRecordMultipleDonationStats($message, $contribution) { -$contribution['receive_date'] = \SmashPig\Core\UtcDate::getUtcDatabaseString($contribution['receive_date']); - -// count stat doesn't exist yet -$this->assertFalse($this->donationStatsCollector->exists("count")); - -//record stats -for ($i = 0; $i < 3; $i++) { - $this->donationStatsCollector->recordDonationStats($message, $contribution); -} - -$recordedStats = $this->donationStatsCollector->getAllStats(); - -$expected = [ - 'test_namespace.count' => ['ACME_PAYMENTS' => 3], - 'test_namespace.transaction_age' => [ -'ACME_PAYMENTS' => [3600, 3600, 3600], - ], -]; - -$this->assertEquals($expected, $recordedStats); - } - - /** - * @dataProvider singleDummyDonationDataProvider - */ - public function testCanGenerateDonationProcessingRateStats($message, $contribution) { -$contribution['receive_date'] =
[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' of ssh://gerrit.wikimedia.org:29418/wi...
Jgleeson has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/404682 ) Change subject: Merge branch 'master' of ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm into deployment .. Merge branch 'master' of ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm into deployment a47c16f Restored `composer test` script 6f03194 DonationStats now tracking average processing times abfae19 CiviCRM submodule update 356b429 Add Citibank International to payment instruments on new installs. 97f582f Re-save any contacts without a display name. 69fdda3 Add extension to change contact types a8d515d Update CiviCRM submodule f4821dc Added DonationStatsCollector class to record stats across Donation Queue Consumer. Change-Id: Idd51fbd22966b9f79bff0bcfb25ff5acaeb1189c --- D phpunit.xml 1 file changed, 0 insertions(+), 59 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm refs/changes/82/404682/1 diff --git a/phpunit.xml b/phpunit.xml deleted file mode 100644 index 3204b23..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 (f4821d Added DonationStatsCollector class to record stats across Do) -- To view, visit https://gerrit.wikimedia.org/r/404682 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idd51fbd22966b9f79bff0bcfb25ff5acaeb1189c Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: deployment Gerrit-Owner: Jgleeson___ 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 ssh://gerrit.wikimedia.org:29418/wi...
jenkins-bot has submitted this change and it was merged. Change subject: Merge branch 'master' of ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm into deployment .. Merge branch 'master' of ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm into deployment d93b916 Submodule update. CiviCRM - Do not give validation error on address with no location_type 24480a6 Update thank you letter. 8e05deb Simulate 1000 emails Change-Id: I469b22711c4d98f529c902aac9a8eae75427bded --- 0 files changed, 0 insertions(+), 0 deletions(-) Approvals: Eileen: Looks good to me, approved jenkins-bot: Verified -- To view, visit https://gerrit.wikimedia.org/r/325465 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I469b22711c4d98f529c902aac9a8eae75427bded Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: deployment Gerrit-Owner: EileenGerrit-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 ssh://gerrit.wikimedia.org:29418/wi...
Eileen has uploaded a new change for review. https://gerrit.wikimedia.org/r/325465 Change subject: Merge branch 'master' of ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm into deployment .. Merge branch 'master' of ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm into deployment d93b916 Submodule update. CiviCRM - Do not give validation error on address with no location_type 24480a6 Update thank you letter. 8e05deb Simulate 1000 emails Change-Id: I469b22711c4d98f529c902aac9a8eae75427bded --- 0 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm refs/changes/65/325465/1 -- To view, visit https://gerrit.wikimedia.org/r/325465 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I469b22711c4d98f529c902aac9a8eae75427bded 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 ssh://gerrit.wikimedia.org:29418/wi...
Eileen has submitted this change and it was merged. Change subject: Merge branch 'master' of ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm into deployment .. Merge branch 'master' of ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm into deployment c41cbaf Submodule update (minor CiviCRM update to merge links) Change-Id: I3ce56d693a3960466fa2f65ba16e871b7a26ae20 --- 0 files changed, 0 insertions(+), 0 deletions(-) Approvals: Eileen: Looks good to me, approved jenkins-bot: Verified -- To view, visit https://gerrit.wikimedia.org/r/304123 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3ce56d693a3960466fa2f65ba16e871b7a26ae20 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: deployment Gerrit-Owner: EileenGerrit-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 ssh://gerrit.wikimedia.org:29418/wi...
Eileen has uploaded a new change for review. https://gerrit.wikimedia.org/r/304123 Change subject: Merge branch 'master' of ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm into deployment .. Merge branch 'master' of ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm into deployment c41cbaf Submodule update (minor CiviCRM update to merge links) Change-Id: I3ce56d693a3960466fa2f65ba16e871b7a26ae20 --- 0 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm refs/changes/23/304123/1 -- To view, visit https://gerrit.wikimedia.org/r/304123 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3ce56d693a3960466fa2f65ba16e871b7a26ae20 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