Merge pull request #4749 from atif-shaikh/CRM-15729

[civicrm-core.git] / tests / phpunit / WebTest / Member / EditMembershipTest.php

diff --git a/tests/phpunit/WebTest/Member/EditMembershipTest.php b/tests/phpunit/WebTest/Member/EditMembershipTest.php
index feb6bcbf23af78f425cd98c2282d73d29847c991..0e94438a8edcffbb726d2c02ea00445403d245e6 100644 (file)
--- a/tests/phpunit/WebTest/Member/EditMembershipTest.php
+++ b/tests/phpunit/WebTest/Member/EditMembershipTest.php
@@ -1,9 +1,9 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.4                                                |
+ | CiviCRM version 4.5                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2013                                |
+ | Copyright CiviCRM LLC (c) 2004-2014                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -25,6 +25,10 @@
 */
 
 require_once 'CiviTest/CiviSeleniumTestCase.php';
+
+/**
+ * Class WebTest_Member_EditMembershipTest
+ */
 class WebTest_Member_EditMembershipTest extends CiviSeleniumTestCase {
   protected function setUp() {
     parent::setUp();
@@ -77,8 +81,8 @@ class WebTest_Member_EditMembershipTest extends CiviSeleniumTestCase {
     $this->click('is_override');
     $this->waitForElementPresent('status_id');
     $this->select('status_id', 'label=Current');
-    $this->select('membership_type_id[0]', 'label=Default Organization');
-    $this->select('membership_type_id[1]', 'label=General');
+    $this->select('membership_type_id[0]', 'value=1');
+    $this->select('membership_type_id[1]', 'value=1');
     $this->click('_qf_Membership_upload-bottom');
 
     $this->waitForElementPresent("access");
@@ -89,8 +93,7 @@ class WebTest_Member_EditMembershipTest extends CiviSeleniumTestCase {
     $this->type("sort_name", $contactName);
     $this->click('activity_type_id[35]');
     $this->click('activity_type_id[36]');
-    $this->click("_qf_Search_refresh");
-    $this->waitForPageToLoad($this->getTimeoutMsec());
+    $this->clickLink("_qf_Search_refresh");
 
     $this->assertTrue($this->isElementPresent("xpath=//div[@class='crm-search-results']/table/tbody/tr[2]/td[2][text()='Change Membership Status']"));
     $this->assertTrue($this->isElementPresent("xpath=//div[@class='crm-search-results']/table/tbody/tr[2]/td[3][text()='Status changed from New to Current']"));