From 14e8a71d95db269c02217d64d430f79878de39c9 Mon Sep 17 00:00:00 2001 From: Sereza7 <lucas.charpentier@imt-atlantique.net> Date: Tue, 16 Jan 2024 14:21:05 +0100 Subject: [PATCH 1/2] XWIKI-21775: Admin section: make the name strategy section pass webstandard tests * Fixed a `label` copy pasted too fast: the for attribute did not get updated. * Removed the comment from the test for WYSIWYG --- .../XWiki/EntityNameValidation/Administration.xml | 2 +- .../xwiki-platform-distribution-flavor-test/pom.xml | 12 +----------- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/xwiki-platform-core/xwiki-platform-model/xwiki-platform-model-validation/xwiki-platform-model-validation-ui/src/main/resources/XWiki/EntityNameValidation/Administration.xml b/xwiki-platform-core/xwiki-platform-model/xwiki-platform-model-validation/xwiki-platform-model-validation-ui/src/main/resources/XWiki/EntityNameValidation/Administration.xml index 84c605448cd8..edf7706a8b8a 100644 --- a/xwiki-platform-core/xwiki-platform-model/xwiki-platform-model-validation/xwiki-platform-model-validation-ui/src/main/resources/XWiki/EntityNameValidation/Administration.xml +++ b/xwiki-platform-core/xwiki-platform-model/xwiki-platform-model-validation/xwiki-platform-model-validation-ui/src/main/resources/XWiki/EntityNameValidation/Administration.xml @@ -72,7 +72,7 @@ </dl> <dl> <dt> - <label for="newForbiddenCharacter">$services.localization.render('entitynamevalidation.replacementCharacter.newReplacementCharacter.label')</label> + <label for="newReplacementCharacter">$services.localization.render('entitynamevalidation.replacementCharacter.newReplacementCharacter.label')</label> <span class='xHint'>$services.localization.render('entitynamevalidation.replacementCharacter.newReplacementCharacter.hint')</span> </dt> <dd> diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/pom.xml b/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/pom.xml index f5a55a5f66c5..11c7a2f352f3 100644 --- a/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/pom.xml +++ b/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/pom.xml @@ -287,8 +287,7 @@ <!-- /xwiki/bin/admin/XWiki/XWikiPreferences?editor=globaladmin&section=WYSIWYG TODO https://jira.xwiki.org/browse/XWIKI-21773 --> /xwiki/bin/admin/XWiki/XWikiPreferences?editor=globaladmin&section=Syntaxes - <!-- /xwiki/bin/admin/XWiki/XWikiPreferences?editor=globaladmin&section=nameStrategies - TODO https://jira.xwiki.org/browse/XWIKI-21775 --> + /xwiki/bin/admin/XWiki/XWikiPreferences?editor=globaladmin&section=nameStrategies /xwiki/bin/admin/XWiki/XWikiPreferences?editor=globaladmin&section=SyntaxHighlighting <!-- Mail --> /xwiki/bin/admin/XWiki/XWikiPreferences?editor=globaladmin&section=emailSend @@ -337,15 +336,6 @@ /xwiki/bin/view/Main/AllDocs?view=deletedDocs /xwiki/bin/view/Main/AllDocs?view=deletedAttachments </urlsToTestAsAdmin> - <urlsToTestAsGuest /> - <rssUrlsToTestAsAdmin> - /xwiki/bin/view/Main/DatabaseSearch?xpage=plain&outputSyntax=plain&text=wiki - /xwiki/bin/get/Main/DatabaseSearch?outputSyntax=plain&space=&text=wiki - </rssUrlsToTestAsAdmin> - <rssUrlsToTestAsGuest> - /xwiki/bin/view/Main/DatabaseSearch?xpage=plain&outputSyntax=plain&text=wiki - /xwiki/bin/get/Main/DatabaseSearch?outputSyntax=plain&space=&text=wiki - </rssUrlsToTestAsGuest> <!-- Used only in office importer tests --> <openOfficeExecutable>${openOfficeExecutable}</openOfficeExecutable> </systemPropertyVariables> From 609c227f7f146ad0012b39988ce8115648a7ff41 Mon Sep 17 00:00:00 2001 From: Sereza7 <lucas.charpentier@imt-atlantique.net> Date: Tue, 16 Jan 2024 14:24:40 +0100 Subject: [PATCH 2/2] XWIKI-21775: Admin section: make the name strategy section pass webstandard tests * Reverted unwanted changes --- .../xwiki-platform-distribution-flavor-test/pom.xml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/pom.xml b/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/pom.xml index 11c7a2f352f3..404df03251cd 100644 --- a/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/pom.xml +++ b/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/pom.xml @@ -336,6 +336,15 @@ /xwiki/bin/view/Main/AllDocs?view=deletedDocs /xwiki/bin/view/Main/AllDocs?view=deletedAttachments </urlsToTestAsAdmin> + <urlsToTestAsGuest /> + <rssUrlsToTestAsAdmin> + /xwiki/bin/view/Main/DatabaseSearch?xpage=plain&outputSyntax=plain&text=wiki + /xwiki/bin/get/Main/DatabaseSearch?outputSyntax=plain&space=&text=wiki + </rssUrlsToTestAsAdmin> + <rssUrlsToTestAsGuest> + /xwiki/bin/view/Main/DatabaseSearch?xpage=plain&outputSyntax=plain&text=wiki + /xwiki/bin/get/Main/DatabaseSearch?outputSyntax=plain&space=&text=wiki + </rssUrlsToTestAsGuest> <!-- Used only in office importer tests --> <openOfficeExecutable>${openOfficeExecutable}</openOfficeExecutable> </systemPropertyVariables>