From fb67d37e437e425a52a642cd19b68574b88fe339 Mon Sep 17 00:00:00 2001 From: Ravish Nair Date: Tue, 19 Mar 2013 19:50:27 +0530 Subject: [PATCH] -- webtest fix --- tests/phpunit/WebTest/Mailing/MailingTest.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/tests/phpunit/WebTest/Mailing/MailingTest.php b/tests/phpunit/WebTest/Mailing/MailingTest.php index a0c3b0922c..11731f6957 100644 --- a/tests/phpunit/WebTest/Mailing/MailingTest.php +++ b/tests/phpunit/WebTest/Mailing/MailingTest.php @@ -246,11 +246,11 @@ class WebTest_Mailing_MailingTest extends CiviSeleniumTestCase { $permission = array('edit-1-access-civimail-subscribeunsubscribe-pages'); $this->changePermissions($permission); - $this->open($this->sboxPath . "civicrm/logout?reset=1"); + $this->openCiviPage('logout', 'reset=1', NULL); // build forward url $forwardUrl = array("mailing/forward", "reset=1&jid={$eventQueue->job_id}&qid={$eventQueue->id}&h={$eventQueue->hash}"); - $this->openCiviPage($forwardUrl[0], $forwardUrl[1]); + $this->openCiviPage($forwardUrl[0], $forwardUrl[1], NULL); $this->type("email_0", substr(sha1(rand()), 0, 7) . '@example.com'); $this->type("email_1", substr(sha1(rand()), 0, 7) . '@example.com'); @@ -367,8 +367,7 @@ class WebTest_Mailing_MailingTest extends CiviSeleniumTestCase { $this->waitForPageToLoad($this->getTimeoutMsec()); // Go directly to Schedule and Send Mailing form - $this->open($this->sboxPath . "civicrm/mailing/send?reset=1"); - $this->waitForElementPresent("_qf_Group_cancel"); + $this->openCiviPage('mailing/send', 'reset=1', '_qf_Group_cancel'); //-------select recipients---------- -- 2.25.1