From c19f150e6eac5bab491d61238ee8e5cc23515850 Mon Sep 17 00:00:00 2001
From: monishdeb <monish.deb@webaccessglobal.com>
Date: Tue, 17 Nov 2015 20:31:03 +0530
Subject: [PATCH] 4.7beta1 Webtest failures

---
 tests/phpunit/WebTest/Event/AddPricesetTest.php           | 6 +++---
 tests/phpunit/WebTest/Profile/ProfileAddTest.php          | 6 +++---
 tests/phpunit/WebTest/Report/RolePermissionReportTest.php | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/tests/phpunit/WebTest/Event/AddPricesetTest.php b/tests/phpunit/WebTest/Event/AddPricesetTest.php
index 4043f06345..7ee69617eb 100644
--- a/tests/phpunit/WebTest/Event/AddPricesetTest.php
+++ b/tests/phpunit/WebTest/Event/AddPricesetTest.php
@@ -636,7 +636,7 @@ class WebTest_Event_AddPricesetTest extends CiviSeleniumTestCase {
     $this->verifyText("xpath=//table/tbody/tr/td[text()='Fees']/following-sibling::td/table/tbody/tr[2]/td", preg_quote('$ 2,705.00'));
     $expectedLineItems = array(
       2 => array(
-        1 => 'Full Conference',
+        1 => 'Full Conference ',
         2 => '5',
         3 => '$ 525.00',
         4 => '$ 2,625.00',
@@ -647,13 +647,13 @@ class WebTest_Event_AddPricesetTest extends CiviSeleniumTestCase {
         4 => '$ 50.00',
       ),
       4 => array(
-        1 => 'Evening Sessions - First Night',
+        1 => 'Evening Sessions - First Night ',
         2 => '1',
         3 => '$ 15.00',
         4 => '$ 15.00',
       ),
       5 => array(
-        1 => 'Evening Sessions - Second Night',
+        1 => 'Evening Sessions - Second Night ',
         2 => '1',
         3 => '$ 15.00',
         4 => '$ 15.00',
diff --git a/tests/phpunit/WebTest/Profile/ProfileAddTest.php b/tests/phpunit/WebTest/Profile/ProfileAddTest.php
index 38648f8c2a..dfc8e3ce49 100644
--- a/tests/phpunit/WebTest/Profile/ProfileAddTest.php
+++ b/tests/phpunit/WebTest/Profile/ProfileAddTest.php
@@ -282,7 +282,7 @@ class WebTest_Profile_ProfileAddTest extends CiviSeleniumTestCase {
     $this->select("field_name_2", "value=2");
 
     // click on Save buttonProfile Field Saved
-    $this->clickLink('_qf_Field_next-bottom', "xpath=//a/span[text()=' Add Field']", FALSE);
+    $this->clickLink("xpath=//button/span[text()='Save']", "xpath=//a/span/i[@class='crm-i fa-plus-circle']", FALSE);
 
     // Wait for "saved" status msg
     $this->waitForText('crm-notification-container', "Profile Field Saved");
@@ -293,7 +293,7 @@ class WebTest_Profile_ProfileAddTest extends CiviSeleniumTestCase {
     $id = $id[1];
 
     // click on Edit Settings
-    $this->clickLink("xpath=//a/span[text()=' Edit Settings']", '_qf_Group_next-bottom', FALSE);
+    $this->clickLink("xpath=//a/span/i[@class='crm-i fa-wrench']", '_qf_Group_next-bottom', FALSE);
 
     // check for description field
     $this->waitForElementPresent('description');
@@ -301,7 +301,7 @@ class WebTest_Profile_ProfileAddTest extends CiviSeleniumTestCase {
     $this->assertEquals($this->getValue('description'), $profileDescription);
 
     // click on save button
-    $this->clickLink('_qf_Group_next-bottom', "xpath=//a/span[text()=' Edit Settings']", FALSE);
+    $this->clickLink('_qf_Group_next-bottom', "xpath=//a/span/i[@class='crm-i fa-wrench']", FALSE);
 
     // Wait for "saved" status msg
     $this->waitForText('crm-notification-container', 'Profile Saved');
diff --git a/tests/phpunit/WebTest/Report/RolePermissionReportTest.php b/tests/phpunit/WebTest/Report/RolePermissionReportTest.php
index c2eadab251..97c8b0ea91 100644
--- a/tests/phpunit/WebTest/Report/RolePermissionReportTest.php
+++ b/tests/phpunit/WebTest/Report/RolePermissionReportTest.php
@@ -156,7 +156,7 @@ 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=//div[@id='report-tab-col-groups']/table/tbody//tr/td[3]/input[@id='fields_email']"));
+    $this->assertTrue($this->isElementPresent("xpath=//div[@id='report-tab-col-groups']/table/tbody//tr/td[1]/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
@@ -196,7 +196,7 @@ class WebTest_Report_RolePermissionReportTest extends CiviSeleniumTestCase {
     $this->webtestLogin($user, 'Test12345');
     $this->openCiviPage('report/instance/1', 'reset=1');
 
-    $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-col-groups']/table/tbody//tr/td[1]/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
-- 
2.25.1