From: kurund Date: Tue, 13 Aug 2013 19:40:59 +0000 (+0530) Subject: more fixes --filter=testDeletePriceSetforEventTemplate WebTest_Event_AddPricesetTest X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=5be3afb2058d84ffe78166a33f548f214beec157;p=civicrm-core.git more fixes --filter=testDeletePriceSetforEventTemplate WebTest_Event_AddPricesetTest --- diff --git a/tests/phpunit/WebTest/Event/AddPricesetTest.php b/tests/phpunit/WebTest/Event/AddPricesetTest.php index 268bf10bbb..931df41756 100644 --- a/tests/phpunit/WebTest/Event/AddPricesetTest.php +++ b/tests/phpunit/WebTest/Event/AddPricesetTest.php @@ -707,7 +707,8 @@ class WebTest_Event_AddPricesetTest extends CiviSeleniumTestCase { $this->chooseOkOnNextConfirmation(); $this->waitForPageToLoad($this->getTimeoutMsec()); //assert the message - $this->waitForText('price_set_used_by', "it is currently in use by one or more active events or contribution pages or contributions or event templates. If you no longer want to use this price set, click the event template title below, and modify the fees for that event."); + $this->waitForText('price_set_used_by', + "it is currently in use by one or more active events or contribution pages or contributions or event templates."); //check the delete for priceset $this->openCiviPage("admin/price", "reset=1"); @@ -719,14 +720,13 @@ class WebTest_Event_AddPricesetTest extends CiviSeleniumTestCase { $this->chooseOkOnNextConfirmation(); $this->waitForPageToLoad($this->getTimeoutMsec()); //assert the message - $this->waitForText('price_set_used_by', "it is currently in use by one or more active events or contribution pages or contributions or event templates. If you no longer want to use this price set, click the event template title below, and modify the fees for that event. "); + $this->waitForText('price_set_used_by', + "it is currently in use by one or more active events or contribution pages or contributions or event templates."); } function _checkLineItems($expectedLineItems) { foreach ($expectedLineItems as $lineKey => $lineValue) { - foreach ($lineValue as $key => $value) { - $this->verifyText("xpath=//table/tbody/tr/td[text()='Event Fees']/following-sibling::td/table/tbody/tr[$lineKey]/td[$key]", preg_quote($value)); } }