From 3df62fb878de2cf558fc67fc86cd039776fd8b94 Mon Sep 17 00:00:00 2001 From: jitendrapurohit Date: Fri, 29 Apr 2016 19:00:59 +0530 Subject: [PATCH] CRM-18454 - webtest fixes --- tests/phpunit/CiviTest/CiviSeleniumTestCase.php | 2 +- tests/phpunit/WebTest/Contact/AddressParsingTest.php | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/phpunit/CiviTest/CiviSeleniumTestCase.php b/tests/phpunit/CiviTest/CiviSeleniumTestCase.php index af3d1c94ca..bcd778aab9 100644 --- a/tests/phpunit/CiviTest/CiviSeleniumTestCase.php +++ b/tests/phpunit/CiviTest/CiviSeleniumTestCase.php @@ -585,7 +585,7 @@ class CiviSeleniumTestCase extends PHPUnit_Extensions_SeleniumTestCase { $day = date('j', $timeStamp); if (!$multiselect) { - $this->click("xpath=//input[starts-with(@id, '{$dateElement}_display_')]"); + $this->click($dateElement); } $this->waitForElementPresent("css=div#ui-datepicker-div.ui-datepicker div.ui-datepicker-header div.ui-datepicker-title select.ui-datepicker-month"); $this->select("css=div#ui-datepicker-div.ui-datepicker div.ui-datepicker-header div.ui-datepicker-title select.ui-datepicker-month", "value=$mon"); diff --git a/tests/phpunit/WebTest/Contact/AddressParsingTest.php b/tests/phpunit/WebTest/Contact/AddressParsingTest.php index 6676860fa0..f4c5c7d76b 100644 --- a/tests/phpunit/WebTest/Contact/AddressParsingTest.php +++ b/tests/phpunit/WebTest/Contact/AddressParsingTest.php @@ -137,8 +137,8 @@ class WebTest_Contact_AddressParsingTest extends CiviSeleniumTestCase { ), 2 => array( 'street_number' => '121', - 'street_name' => 'SW Sherman Way', - 'street_unit' => 'Suite 15', + 'street_name' => 'Sherman Street', + 'street_unit' => '#15', ), 3 => array( 'street_number' => '121', @@ -147,8 +147,8 @@ class WebTest_Contact_AddressParsingTest extends CiviSeleniumTestCase { ), 4 => array( 'street_number' => '121', - 'street_name' => 'Sherman Street', - 'street_unit' => '#15', + 'street_name' => 'SW Sherman Way', + 'street_unit' => 'Suite 15', ), ); foreach ($verifyData as $loc => $values) { -- 2.25.1