Merge pull request #8010 from mlutfy/master-crm17862

[civicrm-core.git] / tests / phpunit / WebTest / Contact / AddressParsingTest.php

diff --git a/tests/phpunit/WebTest/Contact/AddressParsingTest.php b/tests/phpunit/WebTest/Contact/AddressParsingTest.php
index 453a92ff89656c375df5860d1fca36c31ed14904..6676860fa09ed54d648fd99dcf49564fd0be38cb 100644 (file)
--- a/tests/phpunit/WebTest/Contact/AddressParsingTest.php
+++ b/tests/phpunit/WebTest/Contact/AddressParsingTest.php
@@ -1,9 +1,9 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.6                                                |
+ | CiviCRM version 4.7                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015                                |
+ | Copyright CiviCRM LLC (c) 2004-2016                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -76,6 +76,7 @@ class WebTest_Contact_AddressParsingTest extends CiviSeleniumTestCase {
     $this->click("//div[@id='addMoreAddress1']/a/span");
     $this->waitForElementPresent("address_2_street_address");
     $this->type("address_2_street_address", "121 Sherman Street #15");
+    $this->waitForElementPresent("address_2_city");
     $this->type("address_2_city", "Birmingham");
     $this->type("address_2_postal_code", "3456");
     $this->select("address_2_state_province_id", "value=1002");
@@ -94,6 +95,7 @@ class WebTest_Contact_AddressParsingTest extends CiviSeleniumTestCase {
     $this->click("//div[@id='addMoreAddress3']/a/span");
     $this->waitForElementPresent("address_4_street_address");
     $this->type("address_4_street_address", "121 SW Sherman Way Suite 15");
+    $this->waitForElementPresent("address_4_city");
     $this->type("address_4_city", "Birmingham");
     $this->type("address_4_postal_code", "5491");
     $this->assertSelected('address_4_country_id', "UNITED STATES");
@@ -135,8 +137,8 @@ class WebTest_Contact_AddressParsingTest extends CiviSeleniumTestCase {
       ),
       2 => array(
         'street_number' => '121',
-        'street_name' => 'Sherman Street',
-        'street_unit' => '#15',
+        'street_name' => 'SW Sherman Way',
+        'street_unit' => 'Suite 15',
       ),
       3 => array(
         'street_number' => '121',
@@ -145,8 +147,8 @@ class WebTest_Contact_AddressParsingTest extends CiviSeleniumTestCase {
       ),
       4 => array(
         'street_number' => '121',
-        'street_name' => 'SW Sherman Way',
-        'street_unit' => 'Suite 15',
+        'street_name' => 'Sherman Street',
+        'street_unit' => '#15',
       ),
     );
     foreach ($verifyData as $loc => $values) {