Webtest Fixes

diff --git a/tests/phpunit/WebTest/Contribute/AddBatchesTest.php b/tests/phpunit/WebTest/Contribute/AddBatchesTest.php
index 654854a9b81f02e31557754c2cb06862c7138c97..1cf453cb710bcdd79aae5b0e2280079047c9704a 100644 (file)
--- a/tests/phpunit/WebTest/Contribute/AddBatchesTest.php
+++ b/tests/phpunit/WebTest/Contribute/AddBatchesTest.php
@@ -111,7 +111,6 @@ class WebTest_Contribute_AddBatchesTest extends CiviSeleniumTestCase {
       $this->_fillData($data[$i], $i, "Membership");
     }
     $this->click("_qf_Entry_cancel");
-    $this->waitForPageToLoad($this->getTimeoutMsec());
 
     $this->_verifyData($data, "Membership");
   }
@@ -331,8 +330,8 @@ class WebTest_Contribute_AddBatchesTest extends CiviSeleniumTestCase {
    * @param $type
    */
   public function _verifyData($data, $type) {
-    $this->waitForElementPresent("xpath=//table[@id='DataTables_Table_0']/tbody//tr/td[7]/span/a[1][text()='Enter records']");
-    $this->click("xpath=//table[@id='DataTables_Table_0']/tbody//tr/td[7]/span/a[1][text()='Enter records']");
+    $this->waitForElementPresent("xpath=//div[@class='dataTables_wrapper no-footer']/table/tbody//tr//td/span/a[1][contains(text(),'Enter records')]");
+    $this->click("xpath=//div[@class='dataTables_wrapper no-footer']/table/tbody//tr//td/span/a[1]");
     $this->waitForElementPresent('_qf_Entry_upload');
     $this->click("_qf_Entry_upload");
     $this->waitForPageToLoad($this->getTimeoutMsec());

diff --git a/tests/phpunit/WebTest/Event/AdditionalPaymentTest.php b/tests/phpunit/WebTest/Event/AdditionalPaymentTest.php
index b9322d5dc0de63acb30231e8435b2525458d991c..3269e0d802819cac6a12a2e5ea512701f02f39ec 100644 (file)
--- a/tests/phpunit/WebTest/Event/AdditionalPaymentTest.php
+++ b/tests/phpunit/WebTest/Event/AdditionalPaymentTest.php
@@ -127,6 +127,7 @@ class WebTest_Event_AdditionalPaymentTest extends CiviSeleniumTestCase {
     $this->_checkPaymentInfoTable(800.00, 400.00);
     $balance = 800.00 - 400.00;
     //click through to the contribution view screen
+    $this-> waitForElementPresent("xpath=id('ParticipantView')/div[2]/table[@class='selector row-highlight']/tbody/tr[1]/td[8]/span/a[text()='View']");
     $this->click("xpath=id('ParticipantView')/div[2]/table[@class='selector row-highlight']/tbody/tr[1]/td[8]/span/a[text()='View']");
     $this->waitForElementPresent("xpath=//button//span[contains(text(),'Done')]");
 

diff --git a/tests/phpunit/WebTest/Member/FixedMembershipTypeTest.php b/tests/phpunit/WebTest/Member/FixedMembershipTypeTest.php
index ff0b9fef8d047e98b731666afcadf71d59aef18a..b5803e469b38ecf52d3435e52545935bb11a5032 100644 (file)
--- a/tests/phpunit/WebTest/Member/FixedMembershipTypeTest.php
+++ b/tests/phpunit/WebTest/Member/FixedMembershipTypeTest.php
@@ -526,7 +526,7 @@ SELECT end_event_adjust_interval
     $this->openCiviPage("admin/member/membershipType", "reset=1&action=browse");
 
     $this->click("link=Add Membership Type");
-    $this->waitForElementPresent('_qf_MembershipType_cancel-bottom');
+    $this->waitForElementPresent("xpath=//button//span[contains(text(),'Cancel')]");
 
     $this->type('name', "Membership Type $title");
     $this->select2('member_of_contact_id', $title);