X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=tests%2Fphpunit%2FWebTest%2FGeneric%2FCheckDashboardTest.php;h=131a9a8904ae4a9073c6d8d813b55b0c620845f5;hb=a953e3e44d504c65ced19fac8c7ab8087d5f2072;hp=a5fc470086732a742125e355635250187fbcd1dc;hpb=5563fe43b44b754e6441841a5d92664470b20366;p=civicrm-core.git diff --git a/tests/phpunit/WebTest/Generic/CheckDashboardTest.php b/tests/phpunit/WebTest/Generic/CheckDashboardTest.php index a5fc470086..131a9a8904 100644 --- a/tests/phpunit/WebTest/Generic/CheckDashboardTest.php +++ b/tests/phpunit/WebTest/Generic/CheckDashboardTest.php @@ -26,6 +26,10 @@ */ require_once 'CiviTest/CiviSeleniumTestCase.php'; + +/** + * Class WebTest_Generic_CheckDashboardTest + */ class WebTest_Generic_CheckDashboardTest extends CiviSeleniumTestCase { protected function setUp() { @@ -46,6 +50,11 @@ class WebTest_Generic_CheckDashboardTest extends CiviSeleniumTestCase { // More dashlet tests can be added here using the functions modeled below } + /** + * @param $widgetConfigureID + * @param $widgetEnabledSelector + * @param $widgetTitle + */ function _testAddDashboardElement($widgetConfigureID, $widgetEnabledSelector, $widgetTitle) { // Check if desired widget is already loaded on dashboard and remove it if it is so we can test adding it. // Because it tends to cause problems, all uses of sleep() must be justified in comments @@ -80,14 +89,18 @@ class WebTest_Generic_CheckDashboardTest extends CiviSeleniumTestCase { $this->waitForElementPresent("css=li#widget-2 a.fullscreen-icon"); $this->click("css=li#widget-2 a.fullscreen-icon"); $this->waitForElementPresent("ui-id-1"); - $this->assertTrue($this->isTextPresent($widgetTitle)); + $this->waitForTextPresent("$widgetTitle"); // Because it tends to cause problems, all uses of sleep() must be justified in comments // Sleep should never be used for wait for anything to load from the server // Justification for this instance: FIXME sleep(5); - $this->click("link=close"); + $this->click("xpath=//*[@class='ui-button-text'][contains(text(), 'close')]"); } + /** + * @param $widgetConfigureID + * @param $widgetEnabledSelector + */ function _testRemoveDashboardElement($widgetConfigureID, $widgetEnabledSelector) { $this->click("link=Configure Your Dashboard"); $this->waitForElementPresent("dashlets-header-col-0");