X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=tests%2Fphpunit%2FWebTest%2FReport%2FRolePermissionReportTest.php;h=c2eadab251cb0acc291d272cb7cd5989eabb3675;hb=81621fee4d9c2e8c6f5272a1c6b38a86186fe185;hp=7156faef3acf12b0ccfb05407175fab193a382c0;hpb=95ca1e4e775ce88e3f371abe8390a3526ba537e7;p=civicrm-core.git

diff --git a/tests/phpunit/WebTest/Report/RolePermissionReportTest.php b/tests/phpunit/WebTest/Report/RolePermissionReportTest.php
index 7156faef3a..c2eadab251 100644
--- a/tests/phpunit/WebTest/Report/RolePermissionReportTest.php
+++ b/tests/phpunit/WebTest/Report/RolePermissionReportTest.php
@@ -1,9 +1,9 @@
 <?php
 /*
    +--------------------------------------------------------------------+
-   | CiviCRM version 4.5                                                |
+   | CiviCRM version 4.7                                                |
    +--------------------------------------------------------------------+
-   | Copyright CiviCRM LLC (c) 2004-2014                                |
+   | Copyright CiviCRM LLC (c) 2004-2015                                |
    +--------------------------------------------------------------------+
    | This file is a part of CiviCRM.                                    |
    |                                                                    |
@@ -35,7 +35,7 @@ class WebTest_Report_RolePermissionReportTest extends CiviSeleniumTestCase {
     parent::setUp();
   }
 
-  function testRolePermissionReport() {
+  public function testRolePermissionReport() {
     $this->webtestLogin('admin');
 
     //create new roles
@@ -76,7 +76,7 @@ class WebTest_Report_RolePermissionReportTest extends CiviSeleniumTestCase {
 
     // change report setting to for a particular role
     $this->openCiviPage('report/instance/1', 'reset=1');
-    $this->click("css=div.crm-report_setting-accordion div.crm-accordion-header");
+    $this->click("xpath=//div[@id='mainTabContainer']/ul/li[6]/a");
     $this->waitForElementPresent("_qf_Summary_submit_save");
     $this->select("permission", "value=access CiviCRM");
     $this->select("grouprole-f", "value=$role1");
@@ -95,10 +95,10 @@ class WebTest_Report_RolePermissionReportTest extends CiviSeleniumTestCase {
     $this->_roleDelete($role2);
   }
 
-  /*
-   *check for CRM-10148
+  /**
+   * Check for CRM-10148.
    */
-  function testReservedReportPermission() {
+  public function testReservedReportPermission() {
     $this->webtestLogin('admin');
 
     //create new role
@@ -125,7 +125,7 @@ class WebTest_Report_RolePermissionReportTest extends CiviSeleniumTestCase {
       "edit-{$roleId}-access-civireport",
       "edit-{$roleId}-view-all-contacts",
       "edit-{$roleId}-administer-reports",
-      "edit-{$roleId}-access-civicrm"
+      "edit-{$roleId}-access-civicrm",
     );
     $this->changePermissions($permissions);
 
@@ -133,7 +133,7 @@ class WebTest_Report_RolePermissionReportTest extends CiviSeleniumTestCase {
     $this->openCiviPage('report/instance/1', 'reset=1');
 
     //check if the reserved report field is frozen
-    $this->assertTrue($this->isElementPresent("xpath=//div[@id='instanceForm']//table[3]/tbody//tr/td[2]/span/tt[text()='[ ]']"));
+    $this->assertTrue($this->isElementPresent("xpath=//div[@id='report-tab-access']/table/tbody//tr/td[2]/span/tt[text()='[ ]']"));
 
     // let's give full CiviReport permissions.
     $permissions = array(
@@ -141,7 +141,7 @@ class WebTest_Report_RolePermissionReportTest extends CiviSeleniumTestCase {
       "edit-{$roleId}-view-all-contacts",
       "edit-{$roleId}-administer-reports",
       "edit-{$roleId}-access-civicrm",
-      "edit-{$roleId}-administer-reserved-reports"
+      "edit-{$roleId}-administer-reserved-reports",
     );
     $this->changePermissions($permissions);
 
@@ -156,8 +156,8 @@ class WebTest_Report_RolePermissionReportTest extends CiviSeleniumTestCase {
     $this->openCiviPage('report/instance/1', 'reset=1');
 
     //check if the report criteria and settings is accessible
-    $this->assertTrue($this->isElementPresent("xpath=//form[@id='Summary']//div[@id='id_default']//input[@id='fields_email']"));
-    $this->assertTrue($this->isElementPresent("xpath=//form[@id='Summary']//div[@id='instanceForm']/table//input[@id='title']"));
+    $this->assertTrue($this->isElementPresent("xpath=//div[@id='report-tab-col-groups']/table/tbody//tr/td[3]/input[@id='fields_email']"));
+    $this->assertTrue($this->isElementPresent("xpath=//div[@id='report-tab-format']/table/tbody//tr/td[2]/input[@id='title']"));
 
     //login as admin and remove reserved permission
     $this->webtestLogin('admin');
@@ -166,7 +166,8 @@ class WebTest_Report_RolePermissionReportTest extends CiviSeleniumTestCase {
 
     if ($this->isChecked("edit-2-administer-reserved-reports")) {
       $this->click("edit-2-administer-reserved-reports");
-    } else {
+    }
+    else {
       $this->click("edit-{$roleId}-administer-reserved-reports");
     }
     $this->click("edit-submit");
@@ -176,14 +177,14 @@ class WebTest_Report_RolePermissionReportTest extends CiviSeleniumTestCase {
     $this->webtestLogin($user, 'Test12345');
     $this->openCiviPage('report/instance/1', 'reset=1');
 
-    if ($this->isElementPresent("xpath=//form[@id='Summary']/div[2]/div/div/div")) {
-      $this->verifyNotText("xpath=//form[@id='Summary']/div[2]/div/div/div", "Report Criteria");
+    if ($this->isElementPresent("xpath=//div[@id='mainTabContainer']/ul/li")) {
+      $this->verifyNotText("xpath=//div[@id='mainTabContainer']/ul/li/a", "Columns");
     }
-    if ($this->isElementPresent("xpath=//form[@id='Summary']/div[2]/div[2]/div")) {
-      $this->verifyNotText("xpath=//form[@id='Summary']/div[2]/div[2]/div", "Report Settings");
+    if ($this->isElementPresent("xpath=//li[@id='tab_settings']")) {
+      $this->verifyNotText("xpath=//li[@id='tab_settings']/a", "Title and Format");
     }
 
-    $this->assertFalse($this->isElementPresent("xpath=//form[@id='Summary']//div[@id='instanceForm']//input[@id='title']"));
+    $this->assertFalse($this->isElementPresent("xpath=//div[@id='report-tab-format']/table/tbody//tr/td[2]/input[@id='title']"));
 
     //login as admin and turn the is_reserved flag off for the instance
     $this->webtestLogin('admin');
@@ -195,8 +196,8 @@ class WebTest_Report_RolePermissionReportTest extends CiviSeleniumTestCase {
     $this->webtestLogin($user, 'Test12345');
     $this->openCiviPage('report/instance/1', 'reset=1');
 
-    $this->assertTrue($this->isElementPresent("xpath=//form[@id='Summary']//div[@id='id_default']//input[@id='fields_email']"));
-    $this->assertTrue($this->isElementPresent("xpath=//form[@id='Summary']//div[@id='instanceForm']//input[@id='title']"));
+    $this->assertTrue($this->isElementPresent("xpath=//div[@id='report-tab-col-groups']/table/tbody//tr/td[3]/input[@id='fields_email']"));
+    $this->assertTrue($this->isElementPresent("xpath=//div[@id='report-tab-format']/table/tbody//tr/td[2]/input[@id='title']"));
 
     //login as admin and delete the role
     $this->webtestLogin('admin');
@@ -207,7 +208,7 @@ class WebTest_Report_RolePermissionReportTest extends CiviSeleniumTestCase {
   /**
    * @param $role
    */
-  function _roleDelete($role) {
+  public function _roleDelete($role) {
     $this->waitForElementPresent("xpath=//table[@id='user-roles']/tbody//tr/td[text()='{$role}']/..//td/a[text()='edit role']");
     $this->click("xpath=//table[@id='user-roles']/tbody//tr/td[text()='{$role}']/..//td/a[text()='edit role']");
     $this->waitForElementPresent('edit-delete');
@@ -222,7 +223,7 @@ class WebTest_Report_RolePermissionReportTest extends CiviSeleniumTestCase {
    *
    * @return string
    */
-  function _testCreateUser($roleid) {
+  public function _testCreateUser($roleid) {
 
     $this->open($this->sboxPath . "admin/people/create");
 
@@ -255,4 +256,5 @@ class WebTest_Report_RolePermissionReportTest extends CiviSeleniumTestCase {
     $this->waitForPageToLoad($this->getTimeoutMsec());
     return $name;
   }
+
 }