Webtest fix

diff --git a/tests/phpunit/WebTest/Event/AddPricesetTest.php b/tests/phpunit/WebTest/Event/AddPricesetTest.php
index 5f09b95ee17519fe0944e06c10e65aebf2aa0b18..b0a70870d97a1f24d6cbe369eb8b61c615235aef 100644 (file)
--- a/tests/phpunit/WebTest/Event/AddPricesetTest.php
+++ b/tests/phpunit/WebTest/Event/AddPricesetTest.php
@@ -600,7 +600,7 @@ class WebTest_Event_AddPricesetTest extends CiviSeleniumTestCase {
     $this->type('source', 'Event StandaloneAddTest Webtest');
 
     // Select an event fee
-    $this->waitForElementPresent('priceset');
+    $this->waitForElementPresent("xpath=//div[@id='priceset']/div[2]/div[2]");
     $this->type("//div[@id='priceset']/div[2]/div[2]/input", '5');
     $this->fireEvent("//div[@id='priceset']/div[2]/div[2]/input", 'blur');
     $this->click("xpath=//div[@id='priceset']/div[3]/div[2]/div[1]/span/input");

diff --git a/tests/phpunit/WebTest/Member/OnlineMembershipRenewTest.php b/tests/phpunit/WebTest/Member/OnlineMembershipRenewTest.php
index 61017d891f5ef5b34a18c4afdf8d764d7bc96bb8..cd62fa5442ed956525a60ac4f8a7b7e25f2ae10c 100644 (file)
--- a/tests/phpunit/WebTest/Member/OnlineMembershipRenewTest.php
+++ b/tests/phpunit/WebTest/Member/OnlineMembershipRenewTest.php
@@ -296,7 +296,6 @@ class WebTest_Member_OnlineMembershipRenewTest extends CiviSeleniumTestCase {
     $this->clickLink("_qf_Main_upload-bottom", "_qf_Confirm_next-bottom");
 
     $this->click("_qf_Confirm_next-bottom");
-    $this->waitForPageToLoad($this->getTimeoutMsec());
 
     //Find Member
     $this->openCiviPage("member/search", "reset=1", "member_end_date_high");
@@ -334,7 +333,6 @@ class WebTest_Member_OnlineMembershipRenewTest extends CiviSeleniumTestCase {
     $this->select("credit_card_exp_date[Y]", "value=2020");
     $this->clickLink("_qf_Main_upload-bottom", "_qf_Confirm_next-bottom");
     $this->click("_qf_Confirm_next-bottom");
-    $this->waitForPageToLoad($this->getTimeoutMsec());
 
     //Find Member
     $this->openCiviPage("member/search", "reset=1", "member_end_date_high");