From 074f1be4a76a545a23bd977bcff4640dde363ddc Mon Sep 17 00:00:00 2001
From: Simon Urli <simon.urli@xwiki.com>
Date: Mon, 24 Jul 2023 12:19:19 +0200
Subject: [PATCH] XWIKI-21031: Allow to define reviewed security
vulnerabilities
* Fix integration test on chrome
---
.../extension/security/test/ui/ExtensionSecurityIT.java | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-security/xwiki-platform-extension-security-test/xwiki-platform-extension-security-test-docker/src/test/it/org/xwiki/extension/security/test/ui/ExtensionSecurityIT.java b/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-security/xwiki-platform-extension-security-test/xwiki-platform-extension-security-test-docker/src/test/it/org/xwiki/extension/security/test/ui/ExtensionSecurityIT.java
index d02dd70654e..f42029bbfd7 100644
--- a/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-security/xwiki-platform-extension-security-test/xwiki-platform-extension-security-test-docker/src/test/it/org/xwiki/extension/security/test/ui/ExtensionSecurityIT.java
+++ b/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-security/xwiki-platform-extension-security-test/xwiki-platform-extension-security-test-docker/src/test/it/org/xwiki/extension/security/test/ui/ExtensionSecurityIT.java
@@ -104,14 +104,18 @@ private String createSecurityReviewsSource(TestUtils setup, TestReference testRe
private String createPageFromFile(TestUtils setup, DocumentReference testDocumentReference, String name)
throws IOException
{
- setup.createPage(testDocumentReference, "");
- WikiEditPage wikiEditPage = new ViewPage().editWiki();
+ ViewPage viewPage = setup.createPage(testDocumentReference, "");
+ WikiEditPage wikiEditPage = viewPage.editWiki();
// Can't create the content using setup.createPage as the content is too large.
wikiEditPage.setContent("{{velocity wiki='false'}}\n"
+ IOUtils.toString(getClass().getClassLoader().getResourceAsStream(name),
Charset.defaultCharset())
+ "{{/velocity}}");
wikiEditPage.clickSaveAndView(false);
+ // We don't use gotoPage here as it relies on some markers to ensure the page is properly loaded, which is not
+ // properly working when navigating from a JSON answer.
+ // Here we just want to navigate away from the JSON.
+ setup.getDriver().get(setup.getURL("Main", "WebHome"));
return getLocalRestURL(setup, testDocumentReference);
}
--
GitLab