Ejegg has uploaded a new change for review.
https://gerrit.wikimedia.org/r/224725
Change subject: Merge branch 'master' into deployment
......................................................................
Merge branch 'master' into deployment
Conflicts:
sites/all/modules/wmf_civicrm/tests/phpunit/PhoneImportTest.php
Change-Id: I3c7dbf1ddee6ba8f389a4b20d7823a55a0736189
---
D sites/all/modules/wmf_civicrm/tests/phpunit/PhoneImportTest.php
1 file changed, 0 insertions(+), 47 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm
refs/changes/25/224725/1
diff --git a/sites/all/modules/wmf_civicrm/tests/phpunit/PhoneImportTest.php
b/sites/all/modules/wmf_civicrm/tests/phpunit/PhoneImportTest.php
deleted file mode 100644
index 1844ed3..0000000
--- a/sites/all/modules/wmf_civicrm/tests/phpunit/PhoneImportTest.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<<<<<<< HEAD (8656f8 Merge branch 'master' into deployment)
-=======
-<?php
-
-/**
- * @group Pipeline
- * @group WmfCivicrm
- */
-class PhoneImportTest extends BaseWmfDrupalPhpUnitTestCase {
- public static function getInfo() {
- return array(
- 'name' => 'Phone Number',
- 'group' => 'Pipeline',
- 'description' => 'Ensure we record phone numbers.',
- );
- }
-
- public function testPhoneImport() {
- $phone = '555-555-5555';
-
- $msg = array(
- 'currency' => 'USD',
- 'date' => time(),
- 'email' => '[email protected]',
- 'gateway' => 'test_gateway',
- 'gateway_txn_id' => mt_rand(),
- 'gross' => '1.23',
- 'payment_method' => 'cc',
-
- 'phone' => $phone,
- );
-
- $contribution = wmf_civicrm_contribution_message_import( $msg );
-
- $api = civicrm_api_classapi();
- $api->Phone->Get( array(
- 'contact_id' => $contribution['contact_id'],
- ) );
-
- $this->assertEquals( $phone, $api->values[0]->phone );
- $this->assertEquals( 1, $api->values[0]->is_primary );
- $this->assertEquals( wmf_civicrm_get_default_location_type_id(),
$api->values[0]->location_type_id );
- $this->assertEquals( CRM_Core_OptionGroup::getValue('phone_type',
'phone'), $api->values[0]->phone_type_id );
- }
-
-}
->>>>>>> BRANCH (633e8f set location and phone type and update test)
--
To view, visit https://gerrit.wikimedia.org/r/224725
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3c7dbf1ddee6ba8f389a4b20d7823a55a0736189
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
