projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #4634 from giant-rabbit/JobLogCommandListingBug
[civicrm-core.git]
/
tests
/
phpunit
/
WebTest
/
Member
/
OfflineMembershipRenewTest.php
diff --git
a/tests/phpunit/WebTest/Member/OfflineMembershipRenewTest.php
b/tests/phpunit/WebTest/Member/OfflineMembershipRenewTest.php
index 0129a8384371b9852eedad6881a345757a473167..c4e56352ccb75a987bb5ab312d58fe98e3944de3 100644
(file)
--- a/
tests/phpunit/WebTest/Member/OfflineMembershipRenewTest.php
+++ b/
tests/phpunit/WebTest/Member/OfflineMembershipRenewTest.php
@@
-25,6
+25,10
@@
*/
require_once 'CiviTest/CiviSeleniumTestCase.php';
*/
require_once 'CiviTest/CiviSeleniumTestCase.php';
+
+/**
+ * Class WebTest_Member_OfflineMembershipRenewTest
+ */
class WebTest_Member_OfflineMembershipRenewTest extends CiviSeleniumTestCase {
protected function setUp() {
class WebTest_Member_OfflineMembershipRenewTest extends CiviSeleniumTestCase {
protected function setUp() {
@@
-72,7
+76,6
@@
class WebTest_Member_OfflineMembershipRenewTest extends CiviSeleniumTestCase {
// Clicking save.
$this->click('_qf_Membership_upload-bottom');
// Clicking save.
$this->click('_qf_Membership_upload-bottom');
- $this->waitForPageToLoad($this->getTimeoutMsec());
// page was loaded
$this->waitForTextPresent($sourceText);
// page was loaded
$this->waitForTextPresent($sourceText);
@@
-90,7
+93,6
@@
class WebTest_Member_OfflineMembershipRenewTest extends CiviSeleniumTestCase {
// save the renewed membership
$this->click('_qf_MembershipRenewal_upload-bottom');
// save the renewed membership
$this->click('_qf_MembershipRenewal_upload-bottom');
- $this->waitForPageToLoad($this->getTimeoutMsec());
// page was loaded
$this->waitForTextPresent($sourceText);
// page was loaded
$this->waitForTextPresent($sourceText);
@@
-177,7
+179,6
@@
class WebTest_Member_OfflineMembershipRenewTest extends CiviSeleniumTestCase {
// Clicking save.
$this->click('_qf_Membership_upload-bottom');
// Clicking save.
$this->click('_qf_Membership_upload-bottom');
- $this->waitForPageToLoad($this->getTimeoutMsec());
// page was loaded
$this->waitForTextPresent($sourceText);
// page was loaded
$this->waitForTextPresent($sourceText);
@@
-195,15
+196,14
@@
class WebTest_Member_OfflineMembershipRenewTest extends CiviSeleniumTestCase {
// save the renewed membership
$this->click('_qf_MembershipRenewal_upload-bottom');
// save the renewed membership
$this->click('_qf_MembershipRenewal_upload-bottom');
- $this->waitForPageToLoad($this->getTimeoutMsec());
// page was loaded
$this->waitForTextPresent($sourceText);
// page was loaded
$this->waitForTextPresent($sourceText);
- $this->waitForElementPresent("xpath=//div[@
id='memberships']//table/tbody/tr/td[9]/span/a
[text()='View']");
+ $this->waitForElementPresent("xpath=//div[@
class='dataTables_wrapper no-footer']/table/tbody/tr/td[9]/span[1]/a[1]
[text()='View']");
// click through to the membership view screen
// click through to the membership view screen
- $this->click("xpath=//div[@
id='memberships']//table/tbody/tr/td[9]/span/a
[text()='View']");
+ $this->click("xpath=//div[@
class='dataTables_wrapper no-footer']/table/tbody/tr/td[9]/span[1]/a[1]
[text()='View']");
$this->waitForElementPresent('_qf_MembershipView_cancel-bottom');
$this->waitForElementPresent('_qf_MembershipView_cancel-bottom');
@@
-265,7
+265,6
@@
class WebTest_Member_OfflineMembershipRenewTest extends CiviSeleniumTestCase {
// Clicking save.
$this->click('_qf_Membership_upload-bottom');
// Clicking save.
$this->click('_qf_Membership_upload-bottom');
- $this->waitForPageToLoad($this->getTimeoutMsec());
// page was loaded
$this->waitForTextPresent($sourceText);
// page was loaded
$this->waitForTextPresent($sourceText);
@@
-374,7
+373,6
@@
class WebTest_Member_OfflineMembershipRenewTest extends CiviSeleniumTestCase {
// Clicking save.
$this->click('_qf_Membership_upload-bottom');
// Clicking save.
$this->click('_qf_Membership_upload-bottom');
- $this->waitForPageToLoad($this->getTimeoutMsec());
// page was loaded
$this->waitForTextPresent($sourceText);
// page was loaded
$this->waitForTextPresent($sourceText);