CRM-18454 - webtest fixes

diff --git a/tests/phpunit/CiviTest/CiviSeleniumTestCase.php b/tests/phpunit/CiviTest/CiviSeleniumTestCase.php
index af3d1c94caa858d77ff9869d23006da989cdff15..bcd778aab9f266923ab507e6b50d56de2fefd0eb 100644 (file)
--- 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 6676860fa09ed54d648fd99dcf49564fd0be38cb..f4c5c7d76ba63073b22c2169c83c547e229d01b0 100644 (file)
--- 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) {