jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/379650 )
Change subject: Merge branch 'master' into deployment
......................................................................
Merge branch 'master' into deployment
3bbac063c Remove unnecessary trigger refresh
0ca9c3be3 Retry deadlocked inserts, take two
77c0722c8 Use permissions hook to prevent unlimited dedupe
a4bb77929 Submodule update
Change-Id: Ic978420bc039044b8d9ee19030541f1acedca5c8
---
D sites/all/modules/wmf_civicrm/tests/phpunit/PhoneImportTest.php
1 file changed, 0 insertions(+), 39 deletions(-)
Approvals:
jenkins-bot: Verified
Ejegg: Looks good to me, approved
diff --git a/sites/all/modules/wmf_civicrm/tests/phpunit/PhoneImportTest.php
b/sites/all/modules/wmf_civicrm/tests/phpunit/PhoneImportTest.php
deleted file mode 100644
index da9f432..0000000
--- a/sites/all/modules/wmf_civicrm/tests/phpunit/PhoneImportTest.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<<<<<<< HEAD (fc5690 Update vendor for Omnimail offset fix)
-=======
-<?php
-
-/**
- * @group Pipeline
- * @group WmfCivicrm
- */
-class PhoneImportTest extends BaseWmfDrupalPhpUnitTestCase {
-
- public function testPhoneImport() {
- civicrm_initialize();
-
- $phoneNumber = '555-555-5555';
-
- $msg = array(
- 'currency' => 'USD',
- 'date' => time(),
- 'email' => 'nob...@wikimedia.org',
- 'gateway' => 'test_gateway',
- 'gateway_txn_id' => mt_rand(),
- 'gross' => '1.23',
- 'payment_method' => 'cc',
- 'phone' => $phoneNumber,
- );
-
- $contribution = wmf_civicrm_contribution_message_import( $msg );
-
- $phones = $this->callAPISuccess('Phone', 'get', array('contact_id' =>
$contribution['contact_id'], 'sequential' => 1));
- $phone = $phones['values'][0];
-
- $this->assertEquals($phoneNumber, $phone['phone']);
- $this->assertEquals(1, $phone['is_primary']);
- $this->assertEquals(wmf_civicrm_get_default_location_type_id(),
$phone['location_type_id']);
-
$this->assertEquals(CRM_Core_PseudoConstant::getKey('CRM_Core_BAO_Phone',
'phone_type_id', 'Phone'), $phone['phone_type_id']);
- }
-
-}
->>>>>>> BRANCH (a4bb77 Submodule update)
--
To view, visit https://gerrit.wikimedia.org/r/379650
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic978420bc039044b8d9ee19030541f1acedca5c8
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg <ej...@ejegg.com>
Gerrit-Reviewer: Ejegg <ej...@ejegg.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
