Webtest fix - 4.6

diff --git a/tests/phpunit/WebTest/Event/AdditionalPaymentTest.php b/tests/phpunit/WebTest/Event/AdditionalPaymentTest.php
index 56f7f6bef7ccea38b69853cb1ac0d6f89cd41a68..cf5ceaf3a82c81c9665a201cede5ef49f6ace003 100644 (file)
--- a/tests/phpunit/WebTest/Event/AdditionalPaymentTest.php
+++ b/tests/phpunit/WebTest/Event/AdditionalPaymentTest.php
@@ -109,9 +109,9 @@ class WebTest_Event_AdditionalPaymentTest extends CiviSeleniumTestCase {
 
     // Is status message correct?
     $this->waitForText('crm-notification-container', "Event registration for $displayName has been added");
-    $this->waitForElementPresent("xpath=//form[@class='CRM_Event_Form_Search crm-search-form']/table//tbody/tr[1]/td[8]/span/a[text()='View']");
+    $this->waitForElementPresent("xpath=//form[@class='CRM_Event_Form_Search crm-search-form']/table//tbody/tr[1]/td[8]/span//a[text()='View']");
     //click through to the participant view screen
-    $this->click("xpath=//form[@class='CRM_Event_Form_Search crm-search-form']/table/tbody/tr[1]/td[8]/span/a[text()='View']");
+    $this->click("xpath=//form[@class='CRM_Event_Form_Search crm-search-form']/table/tbody/tr[1]/td[8]/span//a[text()='View']");
     $this->waitForElementPresent("xpath=//button//span[contains(text(),'Done')]");
 
     $this->webtestVerifyTabularData(
@@ -143,7 +143,7 @@ class WebTest_Event_AdditionalPaymentTest extends CiviSeleniumTestCase {
     );
 
     $this->clickAjaxLink("xpath=//button//span[contains(text(),'Done')]");
-    $this->waitForElementPresent("xpath=id('ParticipantView')/div[2]/table[@class='selector row-highlight']/tbody/tr[1]/td[8]/span/a[text()='View']");
+    $this->waitForElementPresent("xpath=//form[@id='ParticipantView']//div/table[@class='selector row-highlight']/tbody/tr[1]/td[8]/span//a[text()='View']");
     // make additional payment
     // 1 - check for links presence on participant view and edit page
     $this->waitForElementPresent("xpath=//form[@id='ParticipantView']//div//table//tbody//td[@id='payment-info']//a[contains(text(), 'Record Payment')]");

diff --git a/tests/phpunit/WebTest/Member/OfflineMembershipRenewTest.php b/tests/phpunit/WebTest/Member/OfflineMembershipRenewTest.php
index cc28803c0170f569382c82988cd31fb610c20421..04cb59052d25bbfdb92035938933d93669560f14 100644 (file)
--- a/tests/phpunit/WebTest/Member/OfflineMembershipRenewTest.php
+++ b/tests/phpunit/WebTest/Member/OfflineMembershipRenewTest.php
@@ -201,9 +201,9 @@ class WebTest_Member_OfflineMembershipRenewTest extends CiviSeleniumTestCase {
     $this->waitForElementPresent("xpath=//table[@class='display dataTable no-footer']/tbody/tr/td[9]/span/a[contains(text(), 'View')]");
 
     // click through to the membership view screen
-    $this->click("xpath=//table[@class='display dataTable no-footer']/tbody/tr/td[9]/span/a[contains(text(), 'View')]");
 
-    $this->waitForElementPresent("_qf_MembershipView_cancel-bottom");
+    $this->click("xpath=//table[@class='display dataTable no-footer']/tbody/tr/td[9]/span/a[contains(text(), 'View')]");
+    $this->waitForElementPresent("xpath=//button//span[contains(text(),'Done')]");
 
     $joinDate = date('F jS, Y');
     $startDate = date('F jS, Y', strtotime("+1 month"));