fix version and year

[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
old mode 100755 (executable)
new mode 100644 (file)
index c3d511f..525d85b
--- a/tests/phpunit/WebTest/ACL/AssignUsersToRolesTest.php
+++ b/tests/phpunit/WebTest/ACL/AssignUsersToRolesTest.php
@@ -3,7 +3,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 4.7                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015                                |
+ | Copyright CiviCRM LLC (c) 2004-2016                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -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());
@@ -153,7 +153,6 @@ class WebTest_ACL_AssignUsersToRolesTest extends CiviSeleniumTestCase {
     $label = "TestAclRole" . substr(sha1(rand()), 0, 4);
     $this->waitForElementPresent("label");
     $this->type("label", $label);
-    $this->type("value", "Acl value" . $label);
     $this->click("_qf_Options_next-bottom");
     $this->waitForText('crm-notification-container', "The ACL Role '{$label}' has been saved.");
 
@@ -162,24 +161,29 @@ class WebTest_ACL_AssignUsersToRolesTest extends CiviSeleniumTestCase {
     $this->click('newACL');
     $this->waitForElementPresent("acl_role_id");
     $this->select("acl_role_id", "label=" . $label);
+    $this->waitForAjaxContent();
     $this->select("entity_id", "label={$groupTitle}");
     $this->clickLink("_qf_EntityRole_next-botttom", 'newACL', FALSE);
 
     //Create ACL granting 'Edit' access on smart group to the role
+    $this->waitForAjaxContent();
     $this->openCiviPage("acl", "reset=1");
     $this->click('newACL');
     $this->waitForElementPresent("group_id");
     $this->select("group_id", "label={$smartGroupTitle}");
     $this->select("operation", "label=Edit");
+    $this->waitForAjaxContent();
     $this->select("entity_id", "label={$label}");
     $this->type("name", "describe {$label}");
     $this->clickLink("_qf_ACL_next-bottom", 'newACL', FALSE);
 
     //ACL granting edit permission on events.
+    $this->waitForAjaxContent();
     $this->click('newACL');
     $this->waitForElementPresent('name');
     $this->type("name", "Edit All Events $label");
     $this->select("entity_id", "label={$label}");
+    $this->waitForAjaxContent();
     $this->select("operation", "label=Edit");
     $this->click("xpath=//label[contains(text(), 'Events')]");
     $this->select("event_id", "value=0");
@@ -231,7 +235,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 +321,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);
 
@@ -376,6 +380,7 @@ class WebTest_ACL_AssignUsersToRolesTest extends CiviSeleniumTestCase {
     $this->type("name", "Edit Events{$label}");
     $this->select("operation", "label=Edit");
     $this->select("entity_id", "label={$label}");
+    $this->waitForElementPresent("xpath=//tr[@class='crm-acl-form-block-object_type']/td[2]/label[contains(text(), 'Events')]");
     $this->click("xpath=//tr[@class='crm-acl-form-block-object_type']/td[2]/label[contains(text(), 'Events')]");
     $this->select("event_id", "label=All Events");
     $this->clickLink("_qf_ACL_next-bottom");