From 88a6f4b3c5448b5704a1c42bcc838d84c254494f Mon Sep 17 00:00:00 2001
From: jitendrapurohit <jitendra.purohit@webaccessglobal.com>
Date: Tue, 30 Dec 2014 18:59:13 +0530
Subject: [PATCH] webtest fixes 4.6
---
tests/phpunit/CiviTest/CiviSeleniumTestCase.php | 2 +-
tests/phpunit/WebTest/Contact/AdvancedSearchTest.php | 3 ++-
tests/phpunit/WebTest/Contact/SearchbyDateFilterTest.php | 2 +-
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/tests/phpunit/CiviTest/CiviSeleniumTestCase.php b/tests/phpunit/CiviTest/CiviSeleniumTestCase.php
index b9d26d5f5a..2ebe9af9e0 100644
--- a/tests/phpunit/CiviTest/CiviSeleniumTestCase.php
+++ b/tests/phpunit/CiviTest/CiviSeleniumTestCase.php
@@ -2207,7 +2207,7 @@ class CiviSeleniumTestCase extends PHPUnit_Extensions_SeleniumTestCase {
$this->type("//*[@id='$fieldName']/../div/ul/li//input", $label);
$this->typeKeys("//*[@id='$fieldName']/../div/ul/li//input", $label);
$this->waitForElementPresent("//*[@class='select2-result-label']");
- $this->clickAt("//*[@class='select2-results']/li[1]/div");
+ $this->clickAt("//*[contains(@class,'select2-result-selectable')]/div[contains(@class, 'select2-result-label')]");
}
else {
if ($xpath) {
diff --git a/tests/phpunit/WebTest/Contact/AdvancedSearchTest.php b/tests/phpunit/WebTest/Contact/AdvancedSearchTest.php
index b82d8f1d5b..5cdebbe8f4 100644
--- a/tests/phpunit/WebTest/Contact/AdvancedSearchTest.php
+++ b/tests/phpunit/WebTest/Contact/AdvancedSearchTest.php
@@ -240,7 +240,8 @@ class WebTest_Contact_AdvancedSearchTest extends CiviSeleniumTestCase {
$this->clickLink("_qf_Advanced_refresh", "xpath=//div[@class='crm-search-results']//table/tbody/tr[1]/td[6]");
$stateBeforeSort = $this->getText("xpath=//div[@class='crm-search-results']//table/tbody/tr[1]/td[6]");
- $this->click("xpath=//div[@class='crm-search-results']//table/thead/tr//th/a[contains(text(),'State')]");
+ $this->clickAjaxLink("xpath=//div[@class='crm-search-results']//table/thead/tr//th/a[contains(text(),'State')]");
+ $this->clickAjaxLink("xpath=//div[@class='crm-search-results']//table/thead/tr//th/a[contains(text(),'State')]");
$this->waitForElementPresent("xpath=//div[@class='crm-search-results']//table/thead/tr//th/a[contains(text(),'State')]");
$this->assertElementNotContainsText("xpath=//div[@class='crm-search-results']//table/tbody/tr[1]/td[6]", $stateBeforeSort);
}
diff --git a/tests/phpunit/WebTest/Contact/SearchbyDateFilterTest.php b/tests/phpunit/WebTest/Contact/SearchbyDateFilterTest.php
index 164162292e..cb8870222d 100644
--- a/tests/phpunit/WebTest/Contact/SearchbyDateFilterTest.php
+++ b/tests/phpunit/WebTest/Contact/SearchbyDateFilterTest.php
@@ -307,7 +307,7 @@ class WebTest_Contact_SearchbyDateFilterTest extends CiviSeleniumTestCase {
array(
'type' => 'select',
'locator' => 'contribution_date_relative',
- 'values' => array('This Day'),
+ 'values' => array('Today'),
),
),
),
--
2.25.1