Merge pull request #4004 from civicrm/4.4

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

diff --git a/tests/phpunit/WebTest/Contact/DeceasedContactsAdvancedSearchTest.php b/tests/phpunit/WebTest/Contact/DeceasedContactsAdvancedSearchTest.php
index d079e6c24ff88986e578e09cc9402229b1ad4a0e..bfa6736e3f758390f89a2975e3cee7870518fd3a 100644 (file)
--- a/tests/phpunit/WebTest/Contact/DeceasedContactsAdvancedSearchTest.php
+++ b/tests/phpunit/WebTest/Contact/DeceasedContactsAdvancedSearchTest.php
@@ -25,6 +25,10 @@
 */
 
 require_once 'CiviTest/CiviSeleniumTestCase.php';
+
+/**
+ * Class WebTest_Contact_DeceasedContactsAdvancedSearchTest
+ */
 class WebTest_Contact_DeceasedContactsAdvancedSearchTest extends CiviSeleniumTestCase {
 
   protected function setUp() {
@@ -57,7 +61,7 @@ class WebTest_Contact_DeceasedContactsAdvancedSearchTest extends CiviSeleniumTes
     $this->openCiviPage('contact/search/advanced', 'reset=1', '_qf_Advanced_refresh');
 
     // Select the group and check deceased contacts
-    $this->select('crmasmSelect1', "label={$groupName}");
+    $this->select('group', "label={$groupName}");
     $this->click('demographics');
     $this->waitForElementPresent('CIVICRM_QFID_1_is_deceased');
     $this->click('CIVICRM_QFID_1_is_deceased');
@@ -67,7 +71,7 @@ class WebTest_Contact_DeceasedContactsAdvancedSearchTest extends CiviSeleniumTes
     $this->waitForTextPresent('2 Selected records only');
 
     $this->select('task', 'label=Remove Contacts from Group');
-    $this->click("xpath=//div[@id='search-status']/table/tbody/tr[3]/td/ul/input[2]");
+    $this->click("Go");
     $this->waitForElementPresent('_qf_RemoveFromGroup_back-bottom');
     $this->assertElementContainsText('crm-container', 'Number of selected contacts: 2');
     $this->select('group_id', "label={$groupName}");
@@ -77,7 +81,7 @@ class WebTest_Contact_DeceasedContactsAdvancedSearchTest extends CiviSeleniumTes
 
     // Search for the contacts who are not deceased
     $this->openCiviPage('contact/search/advanced', 'reset=1', '_qf_Advanced_refresh');
-    $this->select('crmasmSelect1', "label={$groupName}");
+    $this->select('group', "label={$groupName}");
     $this->click('_qf_Advanced_refresh');
 
     // Check if non-deceased contacts are still present
@@ -85,6 +89,13 @@ class WebTest_Contact_DeceasedContactsAdvancedSearchTest extends CiviSeleniumTes
     $this->assertElementContainsText('search-status', '3 Contacts');
   }
 
+  /**
+   * @param $firstName
+   * @param $lastName
+   * @param $email
+   * @param $groupName
+   * @param bool $deceased
+   */
   function _testAddContact($firstName, $lastName, $email, $groupName, $deceased = FALSE) {
     $this->webtestAddContact($firstName, $lastName, $email);
     if ($deceased) {
@@ -106,7 +117,6 @@ class WebTest_Contact_DeceasedContactsAdvancedSearchTest extends CiviSeleniumTes
     $this->waitForElementPresent('_qf_GroupContact_next');
     $this->select('group_id', "{$groupName}");
     $this->click('_qf_GroupContact_next');
-    $this->waitForPageToLoad($this->getTimeoutMsec());
   }
 }