From 6494453bbbbb74061b1df522b66cd15462d574bc Mon Sep 17 00:00:00 2001
From: Sudha Bisht <sudha.bisht@webaccessglobal.com>
Date: Wed, 18 Nov 2015 16:21:43 +0530
Subject: [PATCH] Webtest Fix

---
 tests/phpunit/WebTest/ACL/AssignUsersToRolesTest.php   | 10 +++++-----
 .../WebTest/Member/OfflineMembershipRenewTest.php      |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/tests/phpunit/WebTest/ACL/AssignUsersToRolesTest.php b/tests/phpunit/WebTest/ACL/AssignUsersToRolesTest.php
index 69d1d7932d..f24349b1fe 100755
--- a/tests/phpunit/WebTest/ACL/AssignUsersToRolesTest.php
+++ b/tests/phpunit/WebTest/ACL/AssignUsersToRolesTest.php
@@ -82,7 +82,7 @@ class WebTest_ACL_AssignUsersToRolesTest extends CiviSeleniumTestCase {
     //Create role
     $role = 'role' . substr(sha1(rand()), 0, 7);
     $this->open($this->sboxPath . "admin/people/permissions/roles");
-    $this->waitForElementPresent("edit-submit");
+    $this->waitForAjaxContent();
     $this->type("edit-name", $role);
     $this->click("edit-add");
     $this->waitForPageToLoad($this->getTimeoutMsec());
@@ -231,7 +231,7 @@ class WebTest_ACL_AssignUsersToRolesTest extends CiviSeleniumTestCase {
     $role = 'role' . substr(sha1(rand()), 0, 7);
     $this->open($this->sboxPath . "admin/people/permissions/roles");
 
-    $this->waitForElementPresent("edit-add");
+    $this->waitForAjaxContent();
     $this->type("edit-name", $role);
     $this->click("edit-add");
     $this->waitForPageToLoad($this->getTimeoutMsec());
@@ -317,10 +317,10 @@ class WebTest_ACL_AssignUsersToRolesTest extends CiviSeleniumTestCase {
     $this->waitForPageToLoad($this->getTimeoutMsec());
     $this->open($this->sboxPath . "admin/people/permissions/roles");
     $this->waitForElementPresent("xpath=//table[@id='user-roles']/tbody//tr/td[1][text()='{$ACLrole1}']");
-    $roleId = explode('/', $this->getAttribute("xpath=//table[@id='user-roles']/tbody//tr/td[1][text()='{$ACLrole1}']/../td[4]/a[text()='edit permissions']/@href"));
+    $roleId = explode("people/permissions/", $this->getAttribute("xpath=//table[@id='user-roles']/tbody//tr/td[1][text()='{$ACLrole1}']/../td[4]/a[text()='edit permissions']/@href"));
     $permissions = array(
-      "edit-{$roleId[5]}-access-civicrm",
-      "edit-{$roleId[5]}-access-civievent",
+      "edit-{$roleId[1]}-access-civicrm",
+      "edit-{$roleId[1]}-access-civievent",
     );
     $this->changePermissions($permissions);
 
diff --git a/tests/phpunit/WebTest/Member/OfflineMembershipRenewTest.php b/tests/phpunit/WebTest/Member/OfflineMembershipRenewTest.php
index 04cb59052d..c5930a68f6 100644
--- a/tests/phpunit/WebTest/Member/OfflineMembershipRenewTest.php
+++ b/tests/phpunit/WebTest/Member/OfflineMembershipRenewTest.php
@@ -196,14 +196,14 @@ class WebTest_Member_OfflineMembershipRenewTest extends CiviSeleniumTestCase {
     $this->click('_qf_MembershipRenewal_upload-bottom');
 
     // page was loaded
-    $this->waitForTextPresent($sourceText);
+    $this->waitForAjaxContent();
 
     $this->waitForElementPresent("xpath=//table[@class='display dataTable no-footer']/tbody/tr/td[9]/span/a[contains(text(), 'View')]");
 
     // click through to the membership view screen
 
     $this->click("xpath=//table[@class='display dataTable no-footer']/tbody/tr/td[9]/span/a[contains(text(), 'View')]");
-    $this->waitForElementPresent("xpath=//button//span[contains(text(),'Done')]");
+    $this->waitForElementPresent("_qf_MembershipView_cancel-bottom");
 
     $joinDate = date('F jS, Y');
     $startDate = date('F jS, Y', strtotime("+1 month"));
-- 
2.25.1