This is an automated email from the ASF dual-hosted git repository. juanpablo pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/jspwiki.git
commit c968d415ed12f17e59e896462c4f04271b1b3a26 Author: Juan Pablo Santos RodrÃguez <[email protected]> AuthorDate: Thu Oct 28 11:31:57 2021 +0200 Update Selenide to 6.0.3 - closes #148 --- .../jspwiki_logo_s.png | Bin 0 -> 5694 bytes .../jspwiki_logo_s.png | Bin 0 -> 5694 bytes .../jspwiki_logo_s.png | Bin 0 -> 5694 bytes .../main/java/org/apache/wiki/its/AnonymousViewIT.java | 5 +---- .../src/main/java/org/apache/wiki/its/EditIT.java | 5 +---- .../src/main/java/org/apache/wiki/its/LoginIT.java | 5 +---- .../src/main/java/org/apache/wiki/its/SearchIT.java | 5 +---- .../org/apache/wiki/its/WithIntegrationTestSetup.java | 16 ++++++++++++++++ .../main/java/org/apache/wiki/its/environment/Env.java | 15 +++++++++++++-- .../main/java/org/apache/wiki/pages/PageBuilder.java | 8 +++----- jspwiki-it-tests/pom.xml | 2 +- pom.xml | 2 +- 12 files changed, 38 insertions(+), 25 deletions(-) diff --git a/jspwiki-it-tests/jspwiki-it-test-cma-jdbc/build/downloads/3eee9646-1af7-425e-a117-bd7399416182/jspwiki_logo_s.png b/jspwiki-it-tests/jspwiki-it-test-cma-jdbc/build/downloads/3eee9646-1af7-425e-a117-bd7399416182/jspwiki_logo_s.png new file mode 100755 index 0000000..df50b59 Binary files /dev/null and b/jspwiki-it-tests/jspwiki-it-test-cma-jdbc/build/downloads/3eee9646-1af7-425e-a117-bd7399416182/jspwiki_logo_s.png differ diff --git a/jspwiki-it-tests/jspwiki-it-test-custom-absolute-urls/build/downloads/3eeaa04b-0306-4b81-b98a-28e20a23221b/jspwiki_logo_s.png b/jspwiki-it-tests/jspwiki-it-test-custom-absolute-urls/build/downloads/3eeaa04b-0306-4b81-b98a-28e20a23221b/jspwiki_logo_s.png new file mode 100755 index 0000000..df50b59 Binary files /dev/null and b/jspwiki-it-tests/jspwiki-it-test-custom-absolute-urls/build/downloads/3eeaa04b-0306-4b81-b98a-28e20a23221b/jspwiki_logo_s.png differ diff --git a/jspwiki-it-tests/jspwiki-it-test-custom-jdbc/build/downloads/b5b76078-fa77-4aac-bcf6-c4633a2e2bbf/jspwiki_logo_s.png b/jspwiki-it-tests/jspwiki-it-test-custom-jdbc/build/downloads/b5b76078-fa77-4aac-bcf6-c4633a2e2bbf/jspwiki_logo_s.png new file mode 100755 index 0000000..df50b59 Binary files /dev/null and b/jspwiki-it-tests/jspwiki-it-test-custom-jdbc/build/downloads/b5b76078-fa77-4aac-bcf6-c4633a2e2bbf/jspwiki_logo_s.png differ diff --git a/jspwiki-it-tests/jspwiki-selenide-tests/src/main/java/org/apache/wiki/its/AnonymousViewIT.java b/jspwiki-it-tests/jspwiki-selenide-tests/src/main/java/org/apache/wiki/its/AnonymousViewIT.java index 44061b6..e9e318c 100644 --- a/jspwiki-it-tests/jspwiki-selenide-tests/src/main/java/org/apache/wiki/its/AnonymousViewIT.java +++ b/jspwiki-it-tests/jspwiki-selenide-tests/src/main/java/org/apache/wiki/its/AnonymousViewIT.java @@ -18,12 +18,10 @@ */ package org.apache.wiki.its; -import com.codeborne.selenide.junit5.ScreenShooterExtension; import org.apache.wiki.pages.Page; import org.apache.wiki.pages.haddock.ViewWikiPage; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; import java.io.File; @@ -34,8 +32,7 @@ import static com.codeborne.selenide.Condition.not; /** * Anonymous view related tests for Apache JSPWiki */ -@ExtendWith( ScreenShooterExtension.class ) -public class AnonymousViewIT { +public class AnonymousViewIT extends WithIntegrationTestSetup { @Test void anonymousView() { diff --git a/jspwiki-it-tests/jspwiki-selenide-tests/src/main/java/org/apache/wiki/its/EditIT.java b/jspwiki-it-tests/jspwiki-selenide-tests/src/main/java/org/apache/wiki/its/EditIT.java index 0630b2d..2a16cc0 100644 --- a/jspwiki-it-tests/jspwiki-selenide-tests/src/main/java/org/apache/wiki/its/EditIT.java +++ b/jspwiki-it-tests/jspwiki-selenide-tests/src/main/java/org/apache/wiki/its/EditIT.java @@ -18,18 +18,15 @@ */ package org.apache.wiki.its; -import com.codeborne.selenide.junit5.ScreenShooterExtension; import org.apache.wiki.pages.haddock.EditWikiPage; import org.apache.wiki.pages.haddock.ViewWikiPage; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; /** * Edit-related tests for Apache JSPWiki */ -@ExtendWith( ScreenShooterExtension.class ) -public class EditIT { +public class EditIT extends WithIntegrationTestSetup { @Test void createPageAndTestEditPermissions() { diff --git a/jspwiki-it-tests/jspwiki-selenide-tests/src/main/java/org/apache/wiki/its/LoginIT.java b/jspwiki-it-tests/jspwiki-selenide-tests/src/main/java/org/apache/wiki/its/LoginIT.java index 77521b9..65880b8 100644 --- a/jspwiki-it-tests/jspwiki-selenide-tests/src/main/java/org/apache/wiki/its/LoginIT.java +++ b/jspwiki-it-tests/jspwiki-selenide-tests/src/main/java/org/apache/wiki/its/LoginIT.java @@ -18,19 +18,16 @@ */ package org.apache.wiki.its; -import com.codeborne.selenide.junit5.ScreenShooterExtension; import org.apache.wiki.pages.haddock.LoginPage; import org.apache.wiki.pages.haddock.ViewWikiPage; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; /** * Login-related tests for Apache JSPWiki */ -@ExtendWith( ScreenShooterExtension.class ) -public class LoginIT { +public class LoginIT extends WithIntegrationTestSetup { @Test void loginAndLogout() { diff --git a/jspwiki-it-tests/jspwiki-selenide-tests/src/main/java/org/apache/wiki/its/SearchIT.java b/jspwiki-it-tests/jspwiki-selenide-tests/src/main/java/org/apache/wiki/its/SearchIT.java index 3d4d3d6..95c696b 100644 --- a/jspwiki-it-tests/jspwiki-selenide-tests/src/main/java/org/apache/wiki/its/SearchIT.java +++ b/jspwiki-it-tests/jspwiki-selenide-tests/src/main/java/org/apache/wiki/its/SearchIT.java @@ -18,18 +18,15 @@ */ package org.apache.wiki.its; -import com.codeborne.selenide.junit5.ScreenShooterExtension; import org.apache.wiki.its.environment.Env; import org.apache.wiki.pages.haddock.ViewWikiPage; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; /** * Search-related tests for Apache JSPWiki */ -@ExtendWith( ScreenShooterExtension.class ) -public class SearchIT { +public class SearchIT extends WithIntegrationTestSetup { @Test void performSearches() throws Exception { diff --git a/jspwiki-it-tests/jspwiki-selenide-tests/src/main/java/org/apache/wiki/its/WithIntegrationTestSetup.java b/jspwiki-it-tests/jspwiki-selenide-tests/src/main/java/org/apache/wiki/its/WithIntegrationTestSetup.java new file mode 100755 index 0000000..f9ed7fa --- /dev/null +++ b/jspwiki-it-tests/jspwiki-selenide-tests/src/main/java/org/apache/wiki/its/WithIntegrationTestSetup.java @@ -0,0 +1,16 @@ +package org.apache.wiki.its; + +import com.codeborne.selenide.junit5.ScreenShooterExtension; +import org.apache.wiki.its.environment.Env; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.extension.ExtendWith; + +@ExtendWith( ScreenShooterExtension.class ) +public class WithIntegrationTestSetup { + + @BeforeAll + public static void setUp() { + Env.setUp(); + } + +} diff --git a/jspwiki-it-tests/jspwiki-selenide-tests/src/main/java/org/apache/wiki/its/environment/Env.java b/jspwiki-it-tests/jspwiki-selenide-tests/src/main/java/org/apache/wiki/its/environment/Env.java index 90951d8..5a80544 100644 --- a/jspwiki-it-tests/jspwiki-selenide-tests/src/main/java/org/apache/wiki/its/environment/Env.java +++ b/jspwiki-it-tests/jspwiki-selenide-tests/src/main/java/org/apache/wiki/its/environment/Env.java @@ -19,6 +19,8 @@ package org.apache.wiki.its.environment; +import com.codeborne.selenide.Configuration; + /** * Tests' environment values that can be overwritten through System properties. */ @@ -39,8 +41,8 @@ public class Env { /** Amount of time, in milliseconds, to wait for the search index tasks to complete. Default value is {@code 1200}. */ public static final long TESTS_CONFIG_SEARCH_INDEX_WAIT = Long.parseLong( System.getProperty( "it-jspwiki.config.search-index-wait", "1200" ) ); - /** Should the browser start maximized?. Default value is {@code true}. */ - public static final boolean TESTS_CONFIG_START_MAXIMIZED = Boolean.parseBoolean( System.getProperty( "it-jspwiki.config.start-maximized", "true" ) ); + /** Which size should start the browser with?. Default value is {@code 1366x768}. */ + public static final String TESTS_CONFIG_BROWSER_SIZE = System.getProperty( "it-jspwiki.config.browser-size", "1366x768" ); /** Folder where the WebDriver will be downloaded. Default value is {@code ./target/wdm}. */ public static final String TESTS_CONFIG_WDM_TARGET_PATH = System.getProperty( "it-jspwiki.config.wdm.target-path", "./target/wdm" ); @@ -51,4 +53,13 @@ public class Env { /** Janne's password. Default value is {@code myP@5sw0rd}. */ public static final String LOGIN_JANNE_PASSWORD = System.getProperty( "it-jspwiki.login.janne.password", "myP@5sw0rd" ); + public static void setUp() { + Configuration.headless = Env.TESTS_CONFIG_HEADLESS; + Configuration.fastSetValue = true; // default value seems to not send `[` or `{` characters to input controls. weird. + Configuration.reportsFolder = Env.TESTS_CONFIG_REPORTS_FOLDER; + Configuration.browserSize = Env.TESTS_CONFIG_BROWSER_SIZE; + Configuration.downloadsFolder = Env.TESTS_CONFIG_DOWNLOADS_FOLDER; + System.setProperty( "wdm.targetPath", Env.TESTS_CONFIG_WDM_TARGET_PATH ); + } + } diff --git a/jspwiki-it-tests/jspwiki-selenide-tests/src/main/java/org/apache/wiki/pages/PageBuilder.java b/jspwiki-it-tests/jspwiki-selenide-tests/src/main/java/org/apache/wiki/pages/PageBuilder.java index 22d4bd2..f9dfb62 100644 --- a/jspwiki-it-tests/jspwiki-selenide-tests/src/main/java/org/apache/wiki/pages/PageBuilder.java +++ b/jspwiki-it-tests/jspwiki-selenide-tests/src/main/java/org/apache/wiki/pages/PageBuilder.java @@ -18,9 +18,7 @@ */ package org.apache.wiki.pages; -import com.codeborne.selenide.Configuration; import com.codeborne.selenide.Selenide; -import org.apache.wiki.its.environment.Env; /** @@ -43,12 +41,12 @@ public class PageBuilder { * @return {@link Page} instance given on the {@link PageBuilder} constructor. */ public < T extends Page > T openAs( final T page ) { - Configuration.headless = Env.TESTS_CONFIG_HEADLESS; + /* Configuration.headless = Env.TESTS_CONFIG_HEADLESS; Configuration.fastSetValue = true; // default value seems to not send `[` or `{` characters to input controls. weird. Configuration.reportsFolder = Env.TESTS_CONFIG_REPORTS_FOLDER; - Configuration.startMaximized = Env.TESTS_CONFIG_START_MAXIMIZED; + Configuration.browserSize = Env.TESTS_CONFIG_BROWSER_SIZE; Configuration.downloadsFolder = Env.TESTS_CONFIG_DOWNLOADS_FOLDER; - System.setProperty( "wdm.targetPath", Env.TESTS_CONFIG_WDM_TARGET_PATH ); + System.setProperty( "wdm.targetPath", Env.TESTS_CONFIG_WDM_TARGET_PATH ); */ Selenide.open( url ); return page; diff --git a/jspwiki-it-tests/pom.xml b/jspwiki-it-tests/pom.xml index 32bfe05..9b3a8fb 100644 --- a/jspwiki-it-tests/pom.xml +++ b/jspwiki-it-tests/pom.xml @@ -106,10 +106,10 @@ </dependenciesToScan> <systemPropertyVariables> <it-jspwiki.base.url>http://localhost:8080/${it-jspwiki.context}</it-jspwiki.base.url> + <it-jspwiki.config.browser-size>1366x768</it-jspwiki.config.browser-size> <it-jspwiki.config.download-folder>./target/downloads</it-jspwiki.config.download-folder> <it-jspwiki.config.headless>false</it-jspwiki.config.headless> <it-jspwiki.config.reports-folder>${project.basedir}/target/selenide</it-jspwiki.config.reports-folder> - <it-jspwiki.config.start-maximized>true</it-jspwiki.config.start-maximized> <it-jspwiki.config.wdm.target-path>${project.basedir}/target/wdm</it-jspwiki.config.wdm.target-path> <it-jspwiki.login.janne.username>janne</it-jspwiki.login.janne.username> <it-jspwiki.login.janne.password>myP@5sw0rd</it-jspwiki.login.janne.password> diff --git a/pom.xml b/pom.xml index 6769430..ae3b2e8 100644 --- a/pom.xml +++ b/pom.xml @@ -74,7 +74,7 @@ <nekohtml.version>1.9.22</nekohtml.version> <oro.version>2.0.8</oro.version> <sandler.version>0.5</sandler.version> - <selenide.version>5.25.0</selenide.version> + <selenide.version>6.0.3</selenide.version> <slf4j.version>1.7.32</slf4j.version> <stripes.version>1.7.0-async-beta</stripes.version> <tika.version>2.1.0</tika.version>
