fixed merge conflicts

[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 dd04b7e0804f46f90f0aba5a861799374d8c8799..e630f42a61320d4a4f2166f800873090e8056e6e 100644 (file)
--- a/tests/phpunit/WebTest/Contact/DeceasedContactsAdvancedSearchTest.php
+++ b/tests/phpunit/WebTest/Contact/DeceasedContactsAdvancedSearchTest.php
@@ -1,9 +1,9 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.6                                                |
+ | CiviCRM version 4.7                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2014                                |
+ | Copyright CiviCRM LLC (c) 2004-2015                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -22,7 +22,7 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
 require_once 'CiviTest/CiviSeleniumTestCase.php';
 
@@ -35,7 +35,7 @@ class WebTest_Contact_DeceasedContactsAdvancedSearchTest extends CiviSeleniumTes
     parent::setUp();
   }
 
-  function testDeceasedContactsAdvanceSearch() {
+  public function testDeceasedContactsAdvanceSearch() {
     $this->webtestLogin();
     $this->waitForPageToLoad($this->getTimeoutMsec());
 
@@ -70,7 +70,7 @@ class WebTest_Contact_DeceasedContactsAdvancedSearchTest extends CiviSeleniumTes
     $this->click("toggleSelect");
     $this->waitForTextPresent('2 Selected records only');
 
-    $this->select('task', 'label=Remove Contacts from Group');
+    $this->select('task', 'label=Group - remove contacts');
     $this->waitForPageToLoad($this->getTimeoutMsec());
     $this->waitForElementPresent('_qf_RemoveFromGroup_back-bottom');
     $this->assertElementContainsText('crm-container', 'Number of selected contacts: 2');
@@ -96,7 +96,7 @@ class WebTest_Contact_DeceasedContactsAdvancedSearchTest extends CiviSeleniumTes
    * @param string $groupName
    * @param bool $deceased
    */
-  function _testAddContact($firstName, $lastName, $email, $groupName, $deceased = FALSE) {
+  public function _testAddContact($firstName, $lastName, $email, $groupName, $deceased = FALSE) {
     $this->webtestAddContact($firstName, $lastName, $email);
     if ($deceased) {
       $this->click('link=Edit');
@@ -118,5 +118,5 @@ class WebTest_Contact_DeceasedContactsAdvancedSearchTest extends CiviSeleniumTes
     $this->select('group_id', "{$groupName}");
     $this->click('_qf_GroupContact_next');
   }
-}
 
+}