Test fixes

Webtests fixes

diff --git a/tests/phpunit/CiviTest/CiviSeleniumTestCase.php b/tests/phpunit/CiviTest/CiviSeleniumTestCase.php
index af3d1c94caa858d77ff9869d23006da989cdff15..a4d83b61ed5c4af2c0fa831b832816dcd264168e 100644 (file)
--- a/tests/phpunit/CiviTest/CiviSeleniumTestCase.php
+++ b/tests/phpunit/CiviTest/CiviSeleniumTestCase.php
@@ -2460,8 +2460,9 @@ class CiviSeleniumTestCase extends PHPUnit_Extensions_SeleniumTestCase {
     $this->type('frequency_day', '2');
 
     $this->webtestFillDate('acknowledge_date', 'now');
-
+    $this->waitForElementPresent('contribution_page_id');
     $this->select('contribution_page_id', 'value=3');
+    $this->waitForAjaxContent();
 
     //PaymentReminders
     $this->click('PaymentReminders');

diff --git a/tests/phpunit/WebTest/Contact/CreateCmsUserFromContactTest.php b/tests/phpunit/WebTest/Contact/CreateCmsUserFromContactTest.php
index 7243b6a57e12191b1cd7befd66f57506742931e0..3ed844d6abb60da3903c2eb84a03409da89dbf2b 100644 (file)
--- a/tests/phpunit/WebTest/Contact/CreateCmsUserFromContactTest.php
+++ b/tests/phpunit/WebTest/Contact/CreateCmsUserFromContactTest.php
@@ -202,6 +202,7 @@ class WebTest_Contact_CreateCmsUserFromContactTest extends CiviSeleniumTestCase
 
     //submit with matching passwords
     $this->_fillCMSUserForm($firstName, $password, $password);
+    $this->waitForAjaxContent();
     $this->click("_qf_Useradd_next-bottom");
     $this->waitForPageToLoad($this->getTimeoutMsec());
 

diff --git a/tests/phpunit/WebTest/Contact/SearchBuilderTest.php b/tests/phpunit/WebTest/Contact/SearchBuilderTest.php
index 50ea4b529e843086c8e95e3a304469e6b3623587..1763cbf68aa141e5f498dd9f7c7dfa5abc8d98ae 100644 (file)
--- a/tests/phpunit/WebTest/Contact/SearchBuilderTest.php
+++ b/tests/phpunit/WebTest/Contact/SearchBuilderTest.php
@@ -501,18 +501,18 @@ class WebTest_Contact_SearchBuilderTest extends CiviSeleniumTestCase {
 
     $this->clickLink('_qf_Builder_refresh');
     $this->waitForAjaxContent();
-    $this->waitForText('search-status', "2 Contacts");
+    $this->assertElementContainsText("xpath=//div[@id='search-status']/table/tbody/tr[1]/td", "2 Contacts");
 
     $this->click("xpath=//div[@class='crm-accordion-header crm-master-accordion-header']");
     $this->enterValues(1, 2, 'Membership', 'Membership Status', NULL, '=', array('New'));
     $this->clickLink('_qf_Builder_refresh');
     $this->waitForAjaxContent();
-    $this->waitForText('search-status', "1 Contact");
+    $this->assertElementContainsText("xpath=//div[@id='search-status']/table/tbody/tr[1]/td", "1 Contact");
 
     $this->enterValues(1, 2, 'Membership', 'Membership Status', NULL, '=', array('Grace'));
     $this->clickLink('_qf_Builder_refresh');
     $this->waitForAjaxContent();
-    $this->waitForText('search-status', "1 Contact");
+    $this->assertElementContainsText("xpath=//div[@id='search-status']/table/tbody/tr[1]/td", "1 Contact");
 
     $this->click("xpath=//div[@class='crm-accordion-header crm-master-accordion-header']");
     $this->waitForElementPresent("xpath=//div[@id='map-field']/div[1]/table/tbody/tr[2]/td/a");
@@ -520,7 +520,7 @@ class WebTest_Contact_SearchBuilderTest extends CiviSeleniumTestCase {
     $this->enterValues(1, 2, 'Membership', 'Membership Status', NULL, 'IN', array('New', 'Grace'));
     $this->clickLink('_qf_Builder_refresh');
     $this->waitForAjaxContent();
-    $this->waitForText('search-status', "2 Contacts");
+    $this->assertElementContainsText("xpath=//div[@id='search-status']/table/tbody/tr[1]/td", "2 Contacts");
 
     $this->click("xpath=//div[@class='crm-accordion-header crm-master-accordion-header']");
     $this->waitForElementPresent("xpath=//div[@id='map-field']/div[1]/table/tbody/tr[2]/td/a");
@@ -539,7 +539,7 @@ class WebTest_Contact_SearchBuilderTest extends CiviSeleniumTestCase {
     $this->multiselect2("membership_status_id", array("New", "Grace"));
     $this->clickLink('_qf_Search_refresh');
     $this->waitForAjaxContent();
-    $this->waitForText('search-status', "2 Results");
+    $this->assertElementContainsText("xpath=//div[@id='search-status']/table/tbody/tr[1]/td", "2 Results");
 
     $this->openCiviPage("member/search", "reset=1", "_qf_Search_refresh");
     $this->waitForAjaxContent();
@@ -548,7 +548,7 @@ class WebTest_Contact_SearchBuilderTest extends CiviSeleniumTestCase {
     $this->multiselect2("membership_status_id", array("New"));
     $this->click('_qf_Search_refresh');
     $this->waitForAjaxContent();
-    $this->waitForText('search-status', "1 Result");
+    $this->assertElementContainsText("xpath=//div[@id='search-status']/table/tbody/tr[1]/td", "1 Result");
   }
 
 }

diff --git a/tests/phpunit/WebTest/Contribute/OnlineMultiplePaymentProcessorTest.php b/tests/phpunit/WebTest/Contribute/OnlineMultiplePaymentProcessorTest.php
index adeca9dbcf5557d786e87c074dd530d38f835545..07ecbdb14a29d719587eb0d650e0217b77daedde 100644 (file)
--- a/tests/phpunit/WebTest/Contribute/OnlineMultiplePaymentProcessorTest.php
+++ b/tests/phpunit/WebTest/Contribute/OnlineMultiplePaymentProcessorTest.php
@@ -88,8 +88,8 @@ class WebTest_Contribute_OnlineMultiplePaymentProcessorTest extends CiviSelenium
     $this->select("state_province-1", "value=1001");
 
     $this->assertTrue($this->isTextPresent("Payment Method"));
-    $xpath = "xpath=//label[text() = '{$proProcessorName}']/preceding-sibling::input[1]";
-    $this->click($xpath);
+    $this->waitForElementPresent("xpath=//label[text() = '{$proProcessorName}']/preceding-sibling::input[1]");
+    $this->click("xpath=//label[text() = '{$proProcessorName}']/preceding-sibling::input[1]");
 
     $this->waitForElementPresent("credit_card_type");
 
@@ -181,11 +181,11 @@ class WebTest_Contribute_OnlineMultiplePaymentProcessorTest extends CiviSelenium
     $this->waitForElementPresent("xpath=//div[@class='bold pay_later_receipt-section']");
 
     $payLaterInstructionsText = "Pay later instructions $hash";
-    $this->verifyText("xpath=//div[@class='bold pay_later_receipt-section']/p", $payLaterInstructionsText);
+    $this->assertElementContainsText("xpath=//div[@class='bold pay_later_receipt-section']/p", $payLaterInstructionsText);
     $this->click("_qf_Confirm_next-bottom");
 
     $this->waitForElementPresent("xpath=//div[@class='help']/div/p");
-    $this->verifyText("xpath=//div[@class='help']/div/p", $payLaterInstructionsText);
+    $this->assertElementContainsText("xpath=//div[@class='help']/div/p", $payLaterInstructionsText);
 
     //login to check contribution
     $this->openCiviPage("contribute/search", "reset=1", 'contribution_date_low');

diff --git a/tests/phpunit/WebTest/Contribute/UpdateContributionTest.php b/tests/phpunit/WebTest/Contribute/UpdateContributionTest.php
index 2061274f642770aba5f9d525d0c36750892109c4..84114f2d59992d948388858e692a0a6d6b46ce60 100644 (file)
--- a/tests/phpunit/WebTest/Contribute/UpdateContributionTest.php
+++ b/tests/phpunit/WebTest/Contribute/UpdateContributionTest.php
@@ -301,14 +301,14 @@ class WebTest_Contribute_UpdateContributionTest extends CiviSeleniumTestCase {
     $this->webtestLogin();
     $amount = 100.00;
     $this->_testOfflineContribution($amount, "Pending");
-    $this->waitForElementPresent("xpath=//div[@class='view-content']//table[@class='selector row-highlight']/tbody/tr[1]/td[8]/span/a[text()='Edit']");
-    $this->clickLink("xpath=//div[@class='view-content']//table[@class='selector row-highlight']/tbody/tr[1]/td[8]/span/a[text()='Edit']", '_qf_Contribution_cancel-bottom', FALSE);
+    $this->waitForElementPresent("xpath=//table[@class='selector row-highlight']/tbody/tr[1]/td[8]/span/a[text()='Edit']");
+    $this->clickLink("xpath=//table[@class='selector row-highlight']/tbody/tr[1]/td[8]/span/a[text()='Edit']", '_qf_Contribution_cancel-bottom', FALSE);
     //Contribution status
     $this->select("contribution_status_id", "label=Cancelled");
-    $contId = explode('&id=', $this->getAttribute("xpath=//div[@class='view-content']//table[@class='selector row-highlight']/tbody/tr[1]/td[8]/span/a[text()='Edit']@href"));
+    $contId = explode('&id=', $this->getAttribute("xpath=//table[@class='selector row-highlight']/tbody/tr[1]/td[8]/span/a[text()='Edit']@href"));
     $contId = explode('&', $contId[1]);
     $contId = $contId[0];
-    $this->clickLink("_qf_Contribution_upload", "xpath=//div[@class='view-content']//table[@class='selector row-highlight']/tbody/tr[1]/td[8]/span/a[text()='Edit']", FALSE);
+    $this->clickLink("_qf_Contribution_upload", "xpath=//table[@class='selector row-highlight']/tbody/tr[1]/td[8]/span/a[text()='Edit']", FALSE);
     $this->waitForText('crm-notification-container', "The contribution record has been saved.");
 
     //Assertions