X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=tests%2Fphpunit%2FCiviTest%2FCiviMailUtils.php;h=24c2fd7597d5eaeee600f40c0ff9e767f2c246c5;hb=2ac8532edbec25162652efef29faad9f41638ef5;hp=2298cad2b4576e1b32fc5cbffefd10da8e7032e8;hpb=321a3b8f71c70e5f64f5faed4e4e414abfbd3205;p=civicrm-core.git

diff --git a/tests/phpunit/CiviTest/CiviMailUtils.php b/tests/phpunit/CiviTest/CiviMailUtils.php
index 2298cad2b4..24c2fd7597 100644
--- a/tests/phpunit/CiviTest/CiviMailUtils.php
+++ b/tests/phpunit/CiviTest/CiviMailUtils.php
@@ -122,8 +122,9 @@ class CiviMailUtils extends PHPUnit_Framework_TestCase {
         // Change outbound mail setting
         $this->_ut->openCiviPage('admin/setting/smtp', "reset=1", "_qf_Smtp_next");
         $this->_ut->click('xpath=//input[@name="outBound_option" and @value="' . $this->_outBound_option . '"]');
+        // There will be a warning when switching from test to live mode
         if ($this->_outBound_option != CRM_Mailing_Config::OUTBOUND_OPTION_DISABLED) {
-          $this->_ut->chooseOkOnNextConfirmation();
+          $this->_ut->getAlert();
         }
         $this->_ut->clickLink("_qf_Smtp_next");
       }
@@ -164,7 +165,7 @@ class CiviMailUtils extends PHPUnit_Framework_TestCase {
       // Also not sure how robust this is, but there isn't a good
       // identifier for this link either.
       $this->_ut->waitForElementPresent('xpath=//a[contains(text(), "View complete message")]');
-      $this->_ut->clickAjaxLink('xpath=//a[contains(text(), "View complete message")]', NULL);
+      $this->_ut->clickAjaxLink('xpath=//a[contains(text(), "View complete message")]');
       $msg = $this->_ut->getText('css=.ui-dialog-content.crm-ajax-container');
     }
     else {