Author: vmassol
Date: 2008-02-27 21:08:27 +0100 (Wed, 27 Feb 2008)
New Revision: 8046
Modified:
xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.3/distribution-test/selenium-tests/src/test/it/com/xpn/xwiki/it/selenium/WatchListTest.java
xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.3/distribution-test/selenium-tests/src/test/it/com/xpn/xwiki/it/selenium/framework/AbstractXWikiTestCase.java
Log:
XWIKI-2125 : It should be possible to enable/disable the watchlist feature by
wiki
XPWATCHLIST-18 : Move watchlist management screen from platform templates to an
application wiki page
Merging from trunk (rev 8035)
Modified:
xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.3/distribution-test/selenium-tests/src/test/it/com/xpn/xwiki/it/selenium/WatchListTest.java
===================================================================
---
xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.3/distribution-test/selenium-tests/src/test/it/com/xpn/xwiki/it/selenium/WatchListTest.java
2008-02-27 20:05:27 UTC (rev 8045)
+++
xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.3/distribution-test/selenium-tests/src/test/it/com/xpn/xwiki/it/selenium/WatchListTest.java
2008-02-27 20:08:27 UTC (rev 8046)
@@ -42,24 +42,34 @@
{
loginAsAdmin();
- // Test if the email template exists
+ // Test if the email template document exists
open("/xwiki/bin/edit/XWiki/WatchListMessage?editor=object");
assertTextPresent("XWiki.Mail[0]");
+ // Test if the watchlist manager document exists
+ open("/xwiki/bin/view/XWiki/WatchListManager");
+ assertTextPresent("Stay tuned");
+
// Watch Test.TestWatchThisPage
open("/xwiki/bin/edit/Test/TestWatchThisPage?editor=wiki");
setFieldValue("content", "TestWatchThisPage selenium");
clickEditSaveAndView();
- getSelenium().click("link=Watch this page");
+ clickLinkWithText("Watch this page", false);
// Watch TestWatchWholeSpace
open("/xwiki/bin/edit/TestWatchWholeSpace/Test1?editor=wiki");
setFieldValue("content", "TestWatchWholeSpace selenium");
clickEditSaveAndView();
- getSelenium().click("link=Watch whole space");
+ clickLinkWithText("Watch whole space", false);
- getSelenium().click("link=Manage your watchlist");
+ // Verify that the watched page & space are present in the watchlist
manager
+ clickLinkWithLocator("link=Manage your watchlist");
assertTextPresent("TestWatchThisPage");
assertTextPresent("TestWatchWholeSpace");
+
+ // XWIKI-2125
+ // Watchlist menu entry not present if XWiki.WatchListManager does not
exists
+
open("/xwiki/bin/delete/XWiki/WatchListManager?confirm=1&xredirect=/xwiki/bin/view/Main/");
+ assertTextNotPresent("Manage your watchlist");
}
}
Modified:
xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.3/distribution-test/selenium-tests/src/test/it/com/xpn/xwiki/it/selenium/framework/AbstractXWikiTestCase.java
===================================================================
---
xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.3/distribution-test/selenium-tests/src/test/it/com/xpn/xwiki/it/selenium/framework/AbstractXWikiTestCase.java
2008-02-27 20:05:27 UTC (rev 8045)
+++
xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.3/distribution-test/selenium-tests/src/test/it/com/xpn/xwiki/it/selenium/framework/AbstractXWikiTestCase.java
2008-02-27 20:08:27 UTC (rev 8046)
@@ -118,6 +118,11 @@
assertTrue("[" + text + "] isn't present.",
getSelenium().isTextPresent(text));
}
+ public void assertTextNotPresent(String text)
+ {
+ assertFalse("[" + text + "] is present.",
getSelenium().isTextPresent(text));
+ }
+
public void assertElementPresent(String elementLocator)
{
assertTrue("[" + elementLocator + "] isn't present.",
isElementPresent(elementLocator));
_______________________________________________
notifications mailing list
[email protected]
http://lists.xwiki.org/mailman/listinfo/notifications
