X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=tests%2Fphpunit%2FWebTest%2FMember%2FEditMembershipTest.php;h=b8c4b32410d9e13d03e1def7c038ad029996258b;hb=6de877255b5e0807eb4b6c660f6d013bd0d2a961;hp=4416c313e41714b425c6381c557de43b5fb0ce53;hpb=6a4880350680e1e4d20e5c8a622a791f926ca750;p=civicrm-core.git

diff --git a/tests/phpunit/WebTest/Member/EditMembershipTest.php b/tests/phpunit/WebTest/Member/EditMembershipTest.php
index 4416c313e4..b8c4b32410 100644
--- a/tests/phpunit/WebTest/Member/EditMembershipTest.php
+++ b/tests/phpunit/WebTest/Member/EditMembershipTest.php
@@ -1,9 +1,9 @@
 <?php
-/* 
+/*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.3                                                |
+ | CiviCRM version 4.5                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2013                                |
+ | Copyright CiviCRM LLC (c) 2004-2014                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -24,7 +24,6 @@
  +--------------------------------------------------------------------+
 */
 
-
 require_once 'CiviTest/CiviSeleniumTestCase.php';
 class WebTest_Member_EditMembershipTest extends CiviSeleniumTestCase {
   protected function setUp() {
@@ -32,7 +31,6 @@ class WebTest_Member_EditMembershipTest extends CiviSeleniumTestCase {
   }
 
   function testEditMembershipActivityTypes() {
-    $this->open($this->sboxPath);
     // Log in using webtestLogin() method
     $this->webtestLogin();
     // create contact
@@ -45,9 +43,7 @@ class WebTest_Member_EditMembershipTest extends CiviSeleniumTestCase {
     $membershipTypes = $this->webtestAddMembershipType();
 
     // now add membership
-    $this->open($this->sboxPath . "civicrm/member/add?reset=1&action=add&context=standalone");
-
-    $this->waitForElementPresent("_qf_Membership_upload");
+    $this->openCiviPage("member/add", "reset=1&action=add&context=standalone", "_qf_Membership_upload");
 
     // select contact
     $this->webtestFillAutocomplete($contactName);
@@ -69,13 +65,11 @@ class WebTest_Member_EditMembershipTest extends CiviSeleniumTestCase {
     $this->click("xpath=//div[@id='memberships']//table/tbody/tr[1]/td[9]/span/a[text()='View']");
     $this->waitForElementPresent("_qf_MembershipView_cancel-bottom");
     $expected = array(
-      2 => $membershipTypes['membership_type'],
-      3 => 'New',
-      4 => 'Membership StandaloneAddTest Webtest',
+      'Membership Type'  => $membershipTypes['membership_type'],
+      'Status' => 'New',
+      'Source' => 'Membership StandaloneAddTest Webtest',
     );
-    foreach ($expected as $label => $value) {
-      $this->verifyText("xpath=id('MembershipView')/div[2]/div/table[1]/tbody/tr[$label]/td[2]", preg_quote($value));
-    }
+    $this->webtestVerifyTabularData($expected);
 
     // now edit and update type and status
     $this->click("crm-membership-edit-button-top");
@@ -83,15 +77,15 @@ 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");
 
     // Use activity search to find the expected activities
-    $this->open($this->sboxPath . "civicrm/activity/search?reset=1");
-    $this->waitForElementPresent("_qf_Search_refresh");
+    $this->openCiviPage('activity/search', 'reset=1', "_qf_Search_refresh");
+
     $this->type("sort_name", $contactName);
     $this->click('activity_type_id[35]');
     $this->click('activity_type_id[36]');
@@ -106,4 +100,3 @@ class WebTest_Member_EditMembershipTest extends CiviSeleniumTestCase {
     $this->assertTrue($this->isElementPresent("xpath=//div[@class='crm-search-results']/table/tbody/tr[3]/td[5]/a[text()='{$contactName}']"));
   }
 }
-