Merge pull request #9595 from totten/master-extbatch-env

[civicrm-core.git] / tests / phpunit / WebTest / Campaign / MailingTest.php

diff --git a/tests/phpunit/WebTest/Campaign/MailingTest.php b/tests/phpunit/WebTest/Campaign/MailingTest.php
index 22388e61a0bf1707e1b96237f764934f50b28a0f..af1e18951995aca78f4b5fad58ce36e95e41705a 100644 (file)
--- a/tests/phpunit/WebTest/Campaign/MailingTest.php
+++ b/tests/phpunit/WebTest/Campaign/MailingTest.php
@@ -3,7 +3,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 4.7                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015                                |
+ | Copyright CiviCRM LLC (c) 2004-2017                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -100,9 +100,12 @@ class WebTest_Campaign_MailingTest extends CiviSeleniumTestCase {
   }
 
   /**
+   * Test mailing add.
+   *
    * @param string $groupName
-   * @param $campaignTitle
-   * @param $firstUserName
+   * @param string $campaignTitle
+   * @param string $title
+   * @param string $firstUserName
    */
   public function mailingAddTest($groupName, $campaignTitle, $title, $firstUserName) {
     //---- create mailing contact and add to mailing Group
@@ -155,13 +158,15 @@ class WebTest_Campaign_MailingTest extends CiviSeleniumTestCase {
     $this->click("xpath=//button[@title='Close']");
 
     //--------track and respond----------
-    $this->click("xpath=//ul/li/a[text()='Tracking']");
+    $this->waitForAjaxContent();
+    $this->click('link=Tracking');
     $this->assertChecked("url_tracking");
     $this->assertChecked("open_tracking");
     // no need tracking for this test
 
     // default header and footer ( with label )
-    $this->click("xpath=//ul/li/a[text()='Header and Footer']");
+    $this->waitForAjaxContent();
+    $this->click('link=Header and Footer');
     $this->select("header_id", "label=Mailing Header");
     $this->select("footer_id", "label=Mailing Footer");