X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=tests%2Fphpunit%2FWebTest%2FContact%2FAddressParsingTest.php;h=26ff03e10ecad27248705b8a0fe2b7638d374f85;hb=fc0a5af621552dea17114a6a92854786429d6da5;hp=2b3b31a3d574ead1e58ff1aabe161ef6ed98ec25;hpb=00ca8648aca9637f2678082ce09f98772533a8cc;p=civicrm-core.git

diff --git a/tests/phpunit/WebTest/Contact/AddressParsingTest.php b/tests/phpunit/WebTest/Contact/AddressParsingTest.php
index 2b3b31a3d5..26ff03e10e 100644
--- a/tests/phpunit/WebTest/Contact/AddressParsingTest.php
+++ b/tests/phpunit/WebTest/Contact/AddressParsingTest.php
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.5                                                |
+ | CiviCRM version 4.6                                                |
  +--------------------------------------------------------------------+
  | Copyright CiviCRM LLC (c) 2004-2014                                |
  +--------------------------------------------------------------------+
@@ -25,13 +25,17 @@
 */
 
 require_once 'CiviTest/CiviSeleniumTestCase.php';
+
+/**
+ * Class WebTest_Contact_AddressParsingTest
+ */
 class WebTest_Contact_AddressParsingTest extends CiviSeleniumTestCase {
 
   protected function setUp() {
     parent::setUp();
   }
 
-  function teststreetAddressParsing() {
+  public function teststreetAddressParsing() {
     // Logging in.
     $this->webtestLogin();
 
@@ -92,7 +96,7 @@ class WebTest_Contact_AddressParsingTest extends CiviSeleniumTestCase {
     $this->type("address_4_street_address", "121 SW Sherman Way Suite 15");
     $this->type("address_4_city", "Birmingham");
     $this->type("address_4_postal_code", "5491");
-    $this->assertTrue($this->isTextPresent("- select - United States"));
+    $this->assertSelected('address_4_country_id', "United States");
     $this->select("address_4_state_province_id", "value=1002");
 
     // Store location type of each address
@@ -117,7 +121,9 @@ class WebTest_Contact_AddressParsingTest extends CiviSeleniumTestCase {
       $this->waitForElementPresent("address_{$i}_street_address");
       $address[$i] = $location[$this->getSelectedLabel("address_{$i}_location_type_id")];
       // Open "Edit Address Elements"
-      $this->click("//table[@id='address_{$i}']//a[text()='Edit Address Elements']");
+      $this->waitForElementPresent('addressBlockId');
+      $this->click('addressBlockId');
+      $this->click("//table[@id='address_table_{$i}']//a[text()='Edit Address Elements']");
     }
 
     //verify all the address fields were parsed correctly
@@ -151,4 +157,3 @@ class WebTest_Contact_AddressParsingTest extends CiviSeleniumTestCase {
     }
   }
 }
-