Webtest fix

diff --git a/tests/phpunit/WebTest/Case/ActivityToCaseTest.php b/tests/phpunit/WebTest/Case/ActivityToCaseTest.php
index e2403c9e8de29d9b5b322304833daa6ffdf6f7ac..54d781012e8a728427895d6633755fc238b73567 100644 (file)
--- a/tests/phpunit/WebTest/Case/ActivityToCaseTest.php
+++ b/tests/phpunit/WebTest/Case/ActivityToCaseTest.php
@@ -316,7 +316,7 @@ class WebTest_Case_ActivityToCaseTest extends CiviSeleniumTestCase {
 
     // change activity status
     $this->select('activity_change_status', 'value=2');
-    $this->click("xpath=//div[@class='ui-dialog-buttonset']/button[2]/span[text()='Continue']");
+    $this->click("xpath=//div[@class='ui-dialog-buttonset']/button[1]/span[2]");
     $this->openCiviPage('case', 'reset=1');
     $this->click("xpath=//table[@class='caseSelector']/tbody//tr/td[2]/a[text()='{$contactName}']/../../td[9]/span/a[text()='Manage']");
     $this->waitForElementPresent('_qf_CaseView_cancel-bottom');

diff --git a/tests/phpunit/WebTest/Case/AddCaseTest.php b/tests/phpunit/WebTest/Case/AddCaseTest.php
index cf62e0c9fa774a32717c72dacf409d660ef34e4d..88037739b9a128e44e8cb6e6827d91e5d7e453b1 100644 (file)
--- a/tests/phpunit/WebTest/Case/AddCaseTest.php
+++ b/tests/phpunit/WebTest/Case/AddCaseTest.php
@@ -53,7 +53,6 @@ class WebTest_Case_AddCaseTest extends CiviSeleniumTestCase {
     $this->openCiviPage('profile/edit', 'reset=1&gid=4', NULL);
     $testUserFirstName = "Testuserfirst";
     $testUserLastName = "Testuserlast";
-    $this->waitForPageToLoad($this->getTimeoutMsec());
     $this->waitForElementPresent("_qf_Edit_next");
     $this->type("first_name", $testUserFirstName);
     $this->type("last_name", $testUserLastName);

diff --git a/tests/phpunit/WebTest/Report/LoggingReportTest.php b/tests/phpunit/WebTest/Report/LoggingReportTest.php
index 915da97e50e5c66ae473e9ebf5c7da40404a3f10..9713d236566314eb5fd710796f85ed15013bcdc7 100644 (file)
--- a/tests/phpunit/WebTest/Report/LoggingReportTest.php
+++ b/tests/phpunit/WebTest/Report/LoggingReportTest.php
@@ -125,7 +125,7 @@ class WebTest_Report_LoggingReportTest extends CiviSeleniumTestCase {
     $this->click('_qf_Relationship_upload-bottom');
     $this->waitForElementPresent("xpath=//div[@class='crm-contact-relationship-current']/div//table/tbody//tr/td[9]/span[2][text()='more']/ul/li[1]/a[text()='Disable']");
     $this->click("xpath=//div[@class='crm-contact-relationship-current']/div//table/tbody//tr/td[9]/span[2][text()='more']/ul/li[1]/a[text()='Disable']");
-    $this->waitForText("xpath=//div[@class='crm-confirm-dialog ui-dialog-content ui-widget-content modal-dialog']", 'Are you sure you want to disable this relationship?');
+    $this->waitForText("xpath=//div[@class='crm-confirm-dialog ui-dialog-content ui-widget-content modal-dialog crm-ajax-container']", 'Are you sure you want to disable this relationship?');
     $this->click("xpath=//div[@class='ui-dialog-buttonset']//button//span[text()='Yes']");
     $this->waitForElementPresent("xpath=//div[@class='crm-contact-relationship-past']/div//table/tbody//tr/td[9]/span[2][text()='more']/ul/li[2]/a[text()='Delete']");
     $this->click("xpath=//div[@class='crm-contact-relationship-past']/div//table/tbody//tr/td[9]/span[2][text()='more']/ul/li[2]/a[text()='Delete']");