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 #4875 from civicrm/minor-fix
[civicrm-core.git]
/
tests
/
phpunit
/
WebTest
/
Contact
/
TagSetSearchTest.php
diff --git
a/tests/phpunit/WebTest/Contact/TagSetSearchTest.php
b/tests/phpunit/WebTest/Contact/TagSetSearchTest.php
index a5edc0ee9cac381e8dbcfab690f1f1edf070d996..69aa3bc607c0b106f6f61e7f25bca3a48e483757 100644
(file)
--- a/
tests/phpunit/WebTest/Contact/TagSetSearchTest.php
+++ b/
tests/phpunit/WebTest/Contact/TagSetSearchTest.php
@@
-35,7
+35,7
@@
class WebTest_Contact_TagSetSearchTest extends CiviSeleniumTestCase {
parent::setUp();
}
parent::setUp();
}
- function testTagSetSearch() {
+
public
function testTagSetSearch() {
$this->webtestLogin();
$tagSet1 = $this->_testAddTagSet();
$this->webtestLogin();
$tagSet1 = $this->_testAddTagSet();
@@
-117,7
+117,7
@@
class WebTest_Contact_TagSetSearchTest extends CiviSeleniumTestCase {
/**
* @return array
*/
/**
* @return array
*/
- function _testAddTagSet() {
+
public
function _testAddTagSet() {
// Go to add tag set url.
$this->openCiviPage('admin/tag', 'action=add&reset=1&tagset=1');
// Go to add tag set url.
$this->openCiviPage('admin/tag', 'action=add&reset=1&tagset=1');
@@
-148,13
+148,12
@@
class WebTest_Contact_TagSetSearchTest extends CiviSeleniumTestCase {
$this->waitForElementPresent("css=table.display tbody tr td");
// verify text
$this->waitForElementPresent("css=table.display tbody tr td");
// verify text
- $this->
waitForElementPresent("xpath=//table//tbody/tr/td[1][text()= '$tagSetName']"
);
+ $this->
assertTrue($this->isTextPresent($tagSetName), 'Missing text: ' . $tagSetName
);
- $tagid = explode('&id=', $this->getAttribute("xpath=//table
//tbody/tr/td[1][text()= '$tagSetName']/following-sibling::td[7
]/span/a[text()= 'Edit']@href"));
+ $tagid = explode('&id=', $this->getAttribute("xpath=//table
[@class='display dataTable no-footer']/tbody//tr/td[1]/div[text()= '$tagSetName']/../../td[8
]/span/a[text()= 'Edit']@href"));
$tagid = explode('&', $tagid[1]);
$tagid = $tagid[0];
return $tagid;
}
}
$tagid = explode('&', $tagid[1]);
$tagid = $tagid[0];
return $tagid;
}
}
-