Merge pull request #3749 from civicrm/4.4

[civicrm-core.git] / tests / phpunit / WebTest / ACL / AssignUsersToRolesTest.php

diff --git a/tests/phpunit/WebTest/ACL/AssignUsersToRolesTest.php b/tests/phpunit/WebTest/ACL/AssignUsersToRolesTest.php
index fa456256e42c667f20f7b7fbdaf91934dff6d68b..8f87b1eb7e3ff363af2c40405c07367e1dfca5fd 100755 (executable)
--- a/tests/phpunit/WebTest/ACL/AssignUsersToRolesTest.php
+++ b/tests/phpunit/WebTest/ACL/AssignUsersToRolesTest.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.                                    |
  |                                                                    |
@@ -25,6 +25,10 @@
 */
 
 require_once 'CiviTest/CiviSeleniumTestCase.php';
+
+/**
+ * Class WebTest_ACL_AssignUsersToRolesTest
+ */
 class WebTest_ACL_AssignUsersToRolesTest extends CiviSeleniumTestCase {
 
   protected function setUp() {
@@ -42,23 +46,22 @@ class WebTest_ACL_AssignUsersToRolesTest extends CiviSeleniumTestCase {
     $this->click("_qf_Edit_upload-bottom");
     $this->waitForPageToLoad($this->getTimeoutMsec());
 
-    $this->assertElementContainsText('crm-notification-container', "The Group '{$groupTitle}' has been saved.");
+    $this->waitForText('crm-notification-container', "The Group '{$groupTitle}' has been saved.");
 
-    $this->openCiviPage("admin/options/acl_role", "group=acl_role&action=add&reset=1", "_qf_Options_cancel-bottom");
+    $this->openCiviPage("admin/options/acl_role", "action=add&reset=1", "_qf_Options_cancel-bottom");
 
     $label = "TestAclRole" . substr(sha1(rand()), 0, 4);
     $this->type("label", $label);
     $this->click("_qf_Options_next-bottom");
-    $this->waitForPageToLoad($this->getTimeoutMsec());
-    $this->assertElementContainsText('crm-notification-container', "The Acl Role '{$label}' has been saved");
+
+    $this->waitForText('crm-notification-container', "The ACL Role '{$label}' has been saved.");
 
     $this->openCiviPage("acl/entityrole", "action=add&reset=1");
 
     $this->select("acl_role_id", "label=" . $label);
     $this->select("entity_id", "label={$groupTitle}");
 
-    $this->click("_qf_EntityRole_next-botttom");
-    $this->waitForPageToLoad($this->getTimeoutMsec());
+    $this->clickLink("_qf_EntityRole_next-botttom");
 
     $this->openCiviPage("acl", "action=add&reset=1");
     $this->click("group_id");
@@ -66,8 +69,7 @@ class WebTest_ACL_AssignUsersToRolesTest extends CiviSeleniumTestCase {
     $this->select("operation", "label=View");
     $this->select("entity_id", "label={$label}");
     $this->type("name", "describe {$label}");
-    $this->click("_qf_ACL_next-bottom");
-    $this->waitForPageToLoad($this->getTimeoutMsec());
+    $this->clickLink("_qf_ACL_next-bottom");
   }
 }