[xwiki-notifications] r9612 - xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiManager xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiResources xwiki-products/xwiki-enterprise-manager/trunk/distribution-test/selenium-tests/src/test/it/com/xpn/xwiki/it/selenium/xem
tmortagne (SVN)
notifications at xwiki.org
Fri May 2 16:23:35 CEST 2008
Author: tmortagne
Date: 2008-05-02 16:23:35 +0200 (Fri, 02 May 2008)
New Revision: 9612
Modified:
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiManager/CreateNewWiki
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiResources/Translations
xwiki-products/xwiki-enterprise-manager/trunk/distribution-test/selenium-tests/src/test/it/com/xpn/xwiki/it/selenium/xem/WikiManagementCreate.java
Log:
XAWM-60: Validate provided wiki name using ajax
* Move messages text in translations page
* Add selenium test
Modified: xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiManager/CreateNewWiki
===================================================================
--- xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiManager/CreateNewWiki 2008-05-02 08:18:58 UTC (rev 9611)
+++ xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiManager/CreateNewWiki 2008-05-02 14:23:35 UTC (rev 9612)
@@ -12,10 +12,10 @@
<customClass></customClass>
<contentAuthor>XWiki.Admin</contentAuthor>
<creationDate>1186676964000</creationDate>
-<date>1209489360000</date>
-<contentUpdateDate>1209489360000</contentUpdateDate>
-<version>63.1</version>
-<title></title>
+<date>1209733029000</date>
+<contentUpdateDate>1209733029000</contentUpdateDate>
+<version>64.1</version>
+<title>CreateNewWiki</title>
<template></template>
<defaultTemplate></defaultTemplate>
<validationScript></validationScript>
@@ -150,9 +150,9 @@
#set ($WSTEPNAME_SUMMARY = "wstep_summary")
#set ($WSTEPLIST = [$WSTEPNAME_INTRO, $WSTEPNAME_WIKINAME, $WSTEPNAME_WIKIDESC, $WSTEPNAME_DATAFROM, $WSTEPNAME_USERS, $WSTEPNAME_SUMMARY])
#set ($ISWIKINAMEAVAILABLE = $xwiki.getDocument("WikiCode.IsWikiNameAvailableService").externalURL)
-#set ($MSG_ERROR_WIKINAMEALREADYUSED = "<div class=\"errormessage\"><span class=\"messagetype\">$msg.get('error'): </span>This identifier is already used</div>")
-#set ($MSG_ERROR_WIKINAMEEMPTY = "<div class=\"errormessage\"><span class=\"messagetype\">$msg.get('error'): </span>Identifier can't be empty</div>")
-#set ($MSG_INFO_WIKINAMEVALID = "<div class=\"infomessage\"><span class=\"messagetype\">$msg.get('info'): </span>You can use this name as new wiki identifier</div>")
+#set ($MSG_ERROR_WIKINAMEALREADYUSED = "<div class=\"errormessage\"><span class=\"messagetype\">$msg.get('error'): </span>$msg.get('wikimanager.wikiname.error.alreadyused')</div>")
+#set ($MSG_ERROR_WIKINAMEEMPTY = "<div class=\"errormessage\"><span class=\"messagetype\">$msg.get('error'): </span>$msg.get('wikimanager.wikiname.error.empty')</div>")
+#set ($MSG_INFO_WIKINAMEVALID = "<div class=\"infomessage\"><span class=\"messagetype\">$msg.get('info'): </span>$msg.get('wikimanager.wikiname.info.valid')</div>")
##
############################################################################################
## REQUEST PARAMETERS
Modified: xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiResources/Translations
===================================================================
--- xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiResources/Translations 2008-05-02 08:18:58 UTC (rev 9611)
+++ xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiResources/Translations 2008-05-02 14:23:35 UTC (rev 9612)
@@ -12,10 +12,10 @@
<customClass></customClass>
<contentAuthor>XWiki.Admin</contentAuthor>
<creationDate>1186679007000</creationDate>
-<date>1208861128000</date>
-<contentUpdateDate>1209394152000</contentUpdateDate>
-<version>1.1</version>
-<title></title>
+<date>1209733032000</date>
+<contentUpdateDate>1209733032000</contentUpdateDate>
+<version>2.1</version>
+<title>Translations</title>
<template></template>
<defaultTemplate></defaultTemplate>
<validationScript></validationScript>
@@ -141,6 +141,9 @@
wikimanager.listwikiempty=There are no open wikis.
wikimanager.erroraliasdoesnotexists=Wiki alias \"{0}\" does not exists.
wikimanager.erroraliasalreadynotexists=Wiki alias \"{0}\" already exists.
+wikimanager.wikiname.error.empty=Identifier can't be empty
+wikimanager.wikiname.error.alreadyused=This identifier is already used
+wikimanager.wikiname.info.valid=You can use this name as new wiki identifier
##
# PROPERTIES
##
Modified: xwiki-products/xwiki-enterprise-manager/trunk/distribution-test/selenium-tests/src/test/it/com/xpn/xwiki/it/selenium/xem/WikiManagementCreate.java
===================================================================
--- xwiki-products/xwiki-enterprise-manager/trunk/distribution-test/selenium-tests/src/test/it/com/xpn/xwiki/it/selenium/xem/WikiManagementCreate.java 2008-05-02 08:18:58 UTC (rev 9611)
+++ xwiki-products/xwiki-enterprise-manager/trunk/distribution-test/selenium-tests/src/test/it/com/xpn/xwiki/it/selenium/xem/WikiManagementCreate.java 2008-05-02 14:23:35 UTC (rev 9612)
@@ -49,25 +49,19 @@
{
super.setUp();
loginAsAdmin();
+
+ open("/xwiki/bin/WikiManager/CreateNewWiki");
}
-
+
/**
* Validate empty wiki creation and all automated actions around it.
*/
public void testCreateEmptyWiki()
{
- open("/xwiki/bin/WikiManager/CreateNewWiki");
- setFieldValue("wikiname", "newemptywiki");
+ setWikiNameFieldValue();
setFieldValue("XWiki.XWikiServerClass_0_description", "A new empty wiki");
submit();
- try {
- Thread.sleep(10000);
- } catch (InterruptedException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
-
// Validate creation finished with no error
assertTextPresent("Your wiki \"newemptywiki\" has been created.");
@@ -80,4 +74,25 @@
// Validate the correct domain is printed in the list
assertTextPresent("newemptywiki.localdomain.com");
}
+
+ /**
+ * Validate the ajax based wiki name validation.
+ */
+ private void setWikiNameFieldValue()
+ {
+ // Validate that an existing wiki name is invalid as wiki name
+ setFieldValue("wikiname", "xwiki");
+ getSelenium().keyUp("wikiname", "\\40");
+ assertTextPresent("This identifier is already used");
+
+ // Validate that "" is invalid as wiki name
+ setFieldValue("wikiname", "");
+ getSelenium().keyUp("wikiname", "\\40");
+ assertTextPresent("Identifier can't be empty");
+
+ // Validate that a not existing wiki name is valid as wiki name
+ setFieldValue("wikiname", "newemptywiki");
+ getSelenium().keyUp("wikiname", "\\40");
+ assertTextPresent("You can use this name as new wiki identifier");
+ }
}
More information about the notifications
mailing list