Merge pull request #4820 from kurund/CRM-15705

[civicrm-core.git] / tests / phpunit / WebTest / Contribute / OnlineMultiplePaymentProcessorTest.php

diff --git a/tests/phpunit/WebTest/Contribute/OnlineMultiplePaymentProcessorTest.php b/tests/phpunit/WebTest/Contribute/OnlineMultiplePaymentProcessorTest.php
index a2c73740131df2743e923113b529624bc7c72c8c..f6b7b67cba16f8aa15c3559854db2c663b515cc0 100644 (file)
--- a/tests/phpunit/WebTest/Contribute/OnlineMultiplePaymentProcessorTest.php
+++ b/tests/phpunit/WebTest/Contribute/OnlineMultiplePaymentProcessorTest.php
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.5                                                |
+ | CiviCRM version 4.6                                                |
  +--------------------------------------------------------------------+
  | Copyright CiviCRM LLC (c) 2004-2014                                |
  +--------------------------------------------------------------------+
@@ -34,7 +34,7 @@ class WebTest_Contribute_OnlineMultiplePaymentProcessorTest extends CiviSelenium
     parent::setUp();
   }
 
-  function testOnlineMultpiplePaymentProcessor() {
+  public function testOnlineMultpiplePaymentProcessor() {
 
     // Log in using webtestLogin() method
     $this->webtestLogin();
@@ -116,7 +116,7 @@ class WebTest_Contribute_OnlineMultiplePaymentProcessorTest extends CiviSelenium
 
   }
 
-  function testOnlineMultiplePaymentProcessorWithPayLater() {
+  public function testOnlineMultiplePaymentProcessorWithPayLater() {
 
     // Log in using webtestLogin() method
     $this->webtestLogin();
@@ -177,20 +177,22 @@ class WebTest_Contribute_OnlineMultiplePaymentProcessorTest extends CiviSelenium
     $this->clickLink("_qf_Main_upload-bottom", "_qf_Confirm_next-bottom");
 
     $payLaterInstructionsText = "Pay later instructions $hash";
-    $this->assertTrue($this->isTextPresent($payLaterInstructionsText));
+    $this->verifyText("xpath=//div[@class='bold pay_later_receipt-section']/p", $payLaterInstructionsText);
 
     $this->click("_qf_Confirm_next-bottom");
     $this->waitForPageToLoad($this->getTimeoutMsec());
 
-    $this->assertTrue($this->isTextPresent($payLaterInstructionsText));
+    $this->verifyText("xpath=//div[@id='help']/div/p", $payLaterInstructionsText);
 
     //login to check contribution
     $this->openCiviPage("contribute/search", "reset=1", 'contribution_date_low');
 
-    $this->type('sort_name', "$firstName $lastName");
+    $this->type('sort_name', "$lastName $firstName");
     $this->check('contribution_test');
-    $this->clickLink('_qf_Search_refresh', "xpath=//div[@id='contributionSearch']//table//tbody/tr[1]/td[11]/span/a[text()='View']");
-    $this->clickLink("xpath=//div[@id='contributionSearch']//table//tbody/tr[1]/td[11]/span/a[text()='View']", '_qf_ContributionView_cancel-bottom', FALSE);
+    $this->click('_qf_Search_refresh');
+    $this->waitForElementPresent("xpath=//div[@id='contributionSearch']/table/tbody/tr[1]/td[11]/span/a[text()='View']");
+    $this->click("xpath=//div[@id='contributionSearch']/table/tbody/tr[1]/td[11]/span/a[text()='View']");
+    $this->waitForElementPresent("_qf_ContributionView_cancel-bottom");
     $expected = array(
       'From'            => "{$firstName} {$lastName}",
       'Financial Type'  => 'Donation',
@@ -200,4 +202,3 @@ class WebTest_Contribute_OnlineMultiplePaymentProcessorTest extends CiviSelenium
     $this->click('_qf_ContributionView_cancel-bottom');
   }
 }
-