webtest fixes 4.6

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

diff --git a/tests/phpunit/WebTest/Contact/AddTest.php b/tests/phpunit/WebTest/Contact/AddTest.php
index f9b07abbe9222ba2b765dac3ed39ac452b78128b..2774d45fe291303cced1d077c6d199308cdf6560 100644 (file)
--- a/tests/phpunit/WebTest/Contact/AddTest.php
+++ b/tests/phpunit/WebTest/Contact/AddTest.php
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.5                                                |
+ | CiviCRM version 4.6                                                |
  +--------------------------------------------------------------------+
  | Copyright CiviCRM LLC (c) 2004-2014                                |
  +--------------------------------------------------------------------+
@@ -25,6 +25,10 @@
 */
 
 require_once 'CiviTest/CiviSeleniumTestCase.php';
+
+/**
+ * Class WebTest_Contact_AddTest
+ */
 class WebTest_Contact_AddTest extends CiviSeleniumTestCase {
 
   protected function setUp() {
@@ -100,7 +104,7 @@ class WebTest_Contact_AddTest extends CiviSeleniumTestCase {
     $this->click("address_1_country_id");
     $this->select("address_1_country_id", "value=" . $this->webtestGetValidCountryID());
 
-    if ($this->assertElementContainsText('address_1', "Latitude")) {
+    if ($this->assertElementContainsText('address_table_1', "Latitude")) {
       $this->type("address_1_geo_code_1", "1234");
       $this->type("address_1_geo_code_2", "5678");
     }
@@ -115,7 +119,7 @@ class WebTest_Contact_AddTest extends CiviSeleniumTestCase {
     $this->click("address_2_country_id");
     $this->select("address_2_country_id", "value=" . $this->webtestGetValidCountryID());
 
-    if ($this->assertElementContainsText('address_2', "Latitude")) {
+    if ($this->assertElementContainsText('address_table_2', "Latitude")) {
       $this->type("address_2_geo_code_1", "1234");
       $this->type("address_2_geo_code_2", "5678");
     }
@@ -199,7 +203,9 @@ class WebTest_Contact_AddTest extends CiviSeleniumTestCase {
     $this->select("phone_1_phone_type_id", "value=" . $this->webtestGetFirstValueForOptionGroup('phone_type'));
 
     //fill in IM
-    $this->assertElementContainsText('im_1_provider_id', "Yahoo MSN AIM GTalk Jabber Skype");
+    foreach (array('Yahoo', 'MSN', 'AIM', 'GTalk', 'Jabber', 'Skype') as $option) {
+      $this->assertSelectHasOption('im_1_provider_id', $option);
+    }
     $this->type("im_1_name", "testSkype");
     $this->select("im_1_location_type_id", "value=3");
     $this->select("im_1_provider_id", "value=6");
@@ -231,7 +237,7 @@ class WebTest_Contact_AddTest extends CiviSeleniumTestCase {
     $this->click("address_1_country_id");
     $this->select("address_1_country_id", "value=" . $this->webtestGetValidCountryID());
 
-    if ($this->assertElementContainsText('address_1', "Latitude")) {
+    if ($this->assertElementContainsText('address_table_1', "Latitude")) {
       $this->type("address_1_geo_code_1", "1234");
       $this->type("address_1_geo_code_2", "5678");
     }
@@ -340,7 +346,7 @@ class WebTest_Contact_AddTest extends CiviSeleniumTestCase {
     $this->click("address_1_country_id");
     $this->select("address_1_country_id", "value=" . $this->webtestGetValidCountryID());
 
-    if ($this->assertElementContainsText('address_1', "Latitude")) {
+    if ($this->assertElementContainsText('address_table_1', "Latitude")) {
       $this->type("address_1_geo_code_1", "1234");
       $this->type("address_1_geo_code_2", "5678");
     }
@@ -439,7 +445,7 @@ class WebTest_Contact_AddTest extends CiviSeleniumTestCase {
     $this->click("_qf_Edit_next");
 
     // Is new contact created?
-    $this->waitForText('crm-notification-container', "$currentEmployer has been created.");
+    $this->waitForText("css=div.crm-status-box-msg", "$currentEmployer Created");
     $this->select2('employer_id', $currentEmployer);
 
     //make sure shared address is selected
@@ -472,7 +478,7 @@ class WebTest_Contact_AddTest extends CiviSeleniumTestCase {
     $this->click("_qf_Edit_next");
 
     // Is new contact created?
-    $this->waitForText('crm-notification-container', "$sharedHousehold has been created.");
+    $this->waitForText("css=div.crm-status-box-msg", "$sharedHousehold Created");
 
     //make sure shared address is selected
     $this->waitForElementPresent('selected_shared_address-2');
@@ -494,8 +500,8 @@ class WebTest_Contact_AddTest extends CiviSeleniumTestCase {
     // make sure relationships are created
     $this->click("xpath=id('tab_rel')/a");
     $this->waitForElementPresent('permission-legend');
-    $this->assertElementContainsText('option11', 'Employee of');
-    $this->assertElementContainsText('option11', 'Household Member of');
+    $this->assertElementContainsText('DataTables_Table_0', 'Employee of');
+    $this->assertElementContainsText('DataTables_Table_0', 'Household Member of');
   }
 }