XWIKI-22659: createinline template error when clicking on a link to m…

…issing top level page * Compute proper reference in case of top level page * Provide a new integration test covering the bug * Change a bit existing PO for CreatePagePage to allow using it also for the modal
xwiki · Nov 18, 2024 · c2eec29 · c2eec29
1 parent 4eb3bb0
commit c2eec29
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 9 deletions.
diff --git a/...inistration-test-docker/src/test/it/org/xwiki/administration/test/ui/PageTemplatesIT.java b/...inistration-test-docker/src/test/it/org/xwiki/administration/test/ui/PageTemplatesIT.java
@@ -36,7 +36,6 @@
 import org.xwiki.test.ui.TestUtils;
 import org.xwiki.test.ui.po.CreatePagePage;
 import org.xwiki.test.ui.po.DocumentDoesNotExistPage;
-import org.xwiki.test.ui.po.PageTypePicker;
 import org.xwiki.test.ui.po.ViewPage;
 import org.xwiki.test.ui.po.editor.EditPage;
 import org.xwiki.test.ui.po.editor.WikiEditPage;
@@ -116,10 +115,9 @@ void createPagesFromTemplate(TestUtils setup, TestReference testReference) throw
         // Verify that clicking on the wanted link pops up a box to choose the template.
         EntityReference wantedLinkReference =
             setup.resolveDocumentReference(testSpace + "." + TEMPLATE_NAME + "Instance" + ".NewPage");
-        vp.clickWantedLink(wantedLinkReference, true);
-        PageTypePicker pageTypePicker = new PageTypePicker();
-        assertEquals(availableTemplateSize, pageTypePicker.countAvailableTemplates());
-        assertTrue(pageTypePicker.getAvailableTemplates().contains(templateProviderFullName));
+        createPagePage = vp.clickWantedLink(wantedLinkReference);
+        assertEquals(availableTemplateSize, createPagePage.getAvailableTemplateSize());
+        assertTrue(createPagePage.getAvailableTemplates().contains(templateProviderFullName));
 
         // Step 3: Create a new page when located on a non-existing page
 

diff --git a/...ngo-skin-test-docker/src/test/it/org/xwiki/flamingo/test/docker/CreatePageAndSpaceIT.java b/...ngo-skin-test-docker/src/test/it/org/xwiki/flamingo/test/docker/CreatePageAndSpaceIT.java
@@ -30,8 +30,10 @@
 import org.xwiki.test.ui.po.CreatePagePage;
 import org.xwiki.test.ui.po.ViewPage;
 import org.xwiki.test.ui.po.editor.EditPage;
+import org.xwiki.test.ui.po.editor.WikiEditPage;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  * Tests basic page and space creation.
@@ -200,5 +202,21 @@ void createPageWithDefaultTitleWithVelocity(TestUtils setup, TestReference refer
         assertEquals("${escapetool.h}if()", editPage.getDocumentTitle());
     }
 
+    @Test
+    @Order(4)
+    void createTopLevelPageFromWantedLink(TestUtils setup, TestReference reference) throws Exception
+    {
+        DocumentReference topLevelDoc = new DocumentReference("xwiki", "TopLevelWantedLink", "WebHome");
+        setup.rest().delete(topLevelDoc);
+        ViewPage page = setup.createPage(reference, "[[TopLevelWantedLink>>xwiki:TopLevelWantedLink.WebHome]]");
+        CreatePagePage createPagePage = page.clickWantedLink(topLevelDoc);
+        createPagePage.clickCreate();
+        WikiEditPage editPage = new WikiEditPage();
+        editPage.sendKeys("Some new content");
+        page = editPage.clickSaveAndView();
+        assertEquals("Some new content", page.getContent());
+        assertTrue(page.getBreadcrumb().hasPathElement("TopLevelWantedLink", true, true));
+    }
+
     // TODO: Add a test for the input validation.
 }
diff --git a/...atform-test/xwiki-platform-test-ui/src/main/java/org/xwiki/test/ui/po/CreatePagePage.java b/...atform-test/xwiki-platform-test-ui/src/main/java/org/xwiki/test/ui/po/CreatePagePage.java
@@ -36,7 +36,7 @@
  * @version $Id$
  * @since 3.2M3
  */
-public class CreatePagePage extends ViewPage
+public class CreatePagePage extends BaseElement
 {
     private static final By errorMessageLocator = By.className("errormessage");
 
@@ -53,7 +53,7 @@ public class CreatePagePage extends ViewPage
     @FindBy(id = "terminal")
     private WebElement isTerminalCheckbox;
 
-    @FindBy(css = "form#create input[type='submit']")
+    @FindBy(css = "form#create input[type='submit'],form#create button[type='submit']")
     private WebElement createButton;
 
     public static CreatePagePage gotoPage()

diff --git a/...iki-platform-test/xwiki-platform-test-ui/src/main/java/org/xwiki/test/ui/po/ViewPage.java b/...iki-platform-test/xwiki-platform-test-ui/src/main/java/org/xwiki/test/ui/po/ViewPage.java
@@ -20,6 +20,7 @@
 package org.xwiki.test.ui.po;
 
 import java.util.List;
+import java.util.Optional;
 import java.util.regex.Pattern;
 
 import org.openqa.selenium.By;
@@ -135,12 +136,17 @@ public void clickWantedLink(String spaceName, String pageName, boolean waitForTe
         clickWantedLink(new DocumentReference("xwiki", spaceName, pageName), waitForTemplateDisplay);
     }
 
+    public CreatePagePage clickWantedLink(EntityReference reference)
+    {
+        return clickWantedLink(reference, true).get();
+    }
+
     /**
      * Clicks on a wanted link in the page.
      *
      * @since 7.2M2
      */
-    public void clickWantedLink(EntityReference reference, boolean waitForTemplateDisplay)
+    public Optional<CreatePagePage> clickWantedLink(EntityReference reference, boolean waitForTemplateDisplay)
     {
         WebElement brokenLink = getDriver().findElement(
             By.xpath("//span[@class='wikicreatelink']/a[contains(@href,'/create/" + getUtil().getURLFragment(reference)
@@ -152,7 +158,9 @@ public void clickWantedLink(EntityReference reference, boolean waitForTemplateDi
             // will all have been displayed.
             getDriver().waitUntilElementIsVisible(
                 By.xpath("//div[@class='modal-dialog']//form[@id='create']//button[@type='submit']"));
+            return Optional.of(new CreatePagePage());
         }
+        return Optional.empty();
     }
 
     public BreadcrumbElement getBreadcrumb()

diff --git a/...ki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/createinline.vm b/...ki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/createinline.vm
@@ -397,7 +397,12 @@
             <span class='label'>$escapetool.xml($services.localization.render('core.create.pageTitle'))</span>
           </dt>
           <dl>
-            #set ($targetDocumentReference = $services.model.createDocumentReference($name, $spaceReference))
+            ## We are creating a top level space.
+            #if ("$!spaceReference" == '' && $isSpace)
+              #set ($targetDocumentReference = $services.model.createDocumentReference('WebHome', $name))
+            #else
+              #set ($targetDocumentReference = $services.model.createDocumentReference($name, $spaceReference))
+            #end
             #hierarchy($targetDocumentReference)
           </dl>
         #end