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..0000000
--- a/sites/all/modules/wmf_civicrm/tests/phpunit/HelperFunctionsTest.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<<<<<<< HEAD   (ce95e5 Little cleanups to large donation notifier)
-=======
-<?php
-
-/**
- * @group WmfCivicrm
- */
-class HelperFunctionsTest extends BaseWmfDrupalPhpUnitTestCase {
-
-    /**
-     * Test wmf_ensure_language_exists
-     *
-     * Maintenance note: the civicrm entity_tag get api returns an odd syntax.
-     *
-     * If that ever gets fixed it may break this test - but only the test would
-     * need to be altered to adapt.
-     *
-     * @throws \CiviCRM_API3_Exception
-     */
-    public function testEnsureLanguageExists() {
-        civicrm_initialize();
-        wmf_civicrm_ensure_language_exists('en_IL');
-        $languages = civicrm_api3('OptionValue', 'get', array(
-            'option_group_name' => '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 <emcnaugh...@wikimedia.org>

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

Reply via email to