From: eileen <emcnaughton@wikimedia.org>
Date: Wed, 13 Feb 2019 18:03:39 +0000 (+1300)
Subject: Attempt to fix unrelated test fail
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=b01048070f04144a6a212817d780bd02f4e2860c;p=civicrm-core.git

Attempt to fix unrelated test fail

This test keeps failing on an unrelated test - perhaps  ['cid'] is
being set & somehow retained - could explain other intermittents
---

diff --git a/tests/phpunit/CRM/Member/Form/MembershipTest.php b/tests/phpunit/CRM/Member/Form/MembershipTest.php
index 8535fb2ea5..4348bc26ad 100644
--- a/tests/phpunit/CRM/Member/Form/MembershipTest.php
+++ b/tests/phpunit/CRM/Member/Form/MembershipTest.php
@@ -144,14 +144,6 @@ class CRM_Member_Form_MembershipTest extends CiviUnitTestCase {
     $this->callAPISuccess('relationship_type', 'delete', array('id' => 20));
   }
 
-  /**
-   *  Test CRM_Member_Form_Membership::buildQuickForm()
-   */
-  //function testCRMMemberFormMembershipBuildQuickForm()
-  //{
-  //    throw new PHPUnit_Framework_IncompleteTestError( "not implemented" );
-  //}
-
   /**
    *  Test CRM_Member_Form_Membership::formRule() with a parameter
    *  that has an empty contact_select_id value
@@ -1112,6 +1104,9 @@ Expires: ',
    * @return \CRM_Member_Form_Membership
    */
   protected function getForm() {
+    if (isset($_REQUEST['cid'])) {
+      unset($_REQUEST['cid']);
+    }
     $form = new CRM_Member_Form_Membership();
     $_SERVER['REQUEST_METHOD'] = 'GET';
     $form->controller = new CRM_Core_Controller();