projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-06-29-23-22-39
[civicrm-core.git]
/
tests
/
phpunit
/
WebTest
/
Campaign
/
ActivityTest.php
diff --git
a/tests/phpunit/WebTest/Campaign/ActivityTest.php
b/tests/phpunit/WebTest/Campaign/ActivityTest.php
index 01de940274e6b4c54408f13d6bf9dd2878febd59..e97ec5810f03291456746b3560db944e11a56904 100644
(file)
--- a/
tests/phpunit/WebTest/Campaign/ActivityTest.php
+++ b/
tests/phpunit/WebTest/Campaign/ActivityTest.php
@@
-196,10
+196,10
@@
class WebTest_Campaign_ActivityTest extends CiviSeleniumTestCase {
// Is status message correct?
$this->waitForText('crm-notification-container', $subject);
// Is status message correct?
$this->waitForText('crm-notification-container', $subject);
- $this->waitForElementPresent("xpath=//div[@class='
dataTables_wrapper no-footer']/table/tbody/tr[1]/td[8]/span
/a[1][text()='View']");
+ $this->waitForElementPresent("xpath=//div[@class='
crm-activity-selector-activity']/div[2]/table/tbody/tr[2]/td[8]/span[1]
/a[1][text()='View']");
// click through to the Activity view screen
// click through to the Activity view screen
- $this->click("xpath=//
table[@class='contact-activity-selector-activity dataTable no-footer']/tbody//tr[2]/td[8]/span/a
[text()='View']");
+ $this->click("xpath=//
div[@class='crm-activity-selector-activity']/div[2]/table/tbody/tr[2]/td[8]/span[1]/a[1]
[text()='View']");
$this->waitForElementPresent("xpath=//button//span[contains(text(),'Done')]");
// verify Activity created
$this->waitForElementPresent("xpath=//button//span[contains(text(),'Done')]");
// verify Activity created