Merge pull request #197 from SCADA-LTS/develop

update selenide from 6.14.1 to 6.17.1 - fixed work with chrome/chrome…
SCADA-LTS · Aug 24, 2023 · 5262fb7 · 5262fb7
2 parents a8d4485 + 9e93e2d
commit 5262fb7
Show file tree

Hide file tree

Showing 25 changed files with 36 additions and 28 deletions.
diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
     <groupId>org.scadalts</groupId>
     <artifactId>scada-lts-e2e</artifactId>
     <name>Scada-LTS-E2E</name>
-    <version>23.0.7-SNAPSHOT</version>
+    <version>23.0.9-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <modules>
@@ -43,7 +43,7 @@
         <scada-lts-e2e-service-impl.version>${project.version}</scada-lts-e2e-service-impl.version>
         <scada-lts-e2e-service-core.version>${project.version}</scada-lts-e2e-service-core.version>
 
-        <selenide.version>6.14.1</selenide.version>
+        <selenide.version>6.17.1</selenide.version>
         <selenium-opera-driver.version>4.4.0</selenium-opera-driver.version>
         <junit.version>4.13.1</junit.version>
         <lombok.version>1.18.24</lombok.version>
@@ -635,7 +635,7 @@
                     <configuration>
                         <fork>true</fork>
                         <mainClass>${start-class}</mainClass>
-                        <finalName>${project.artifactId}-${project.version}-${test.e2e.env}-${test.e2e.browser-ref}${test.e2e.custom-name}</finalName>
+                        <finalName>${project.artifactId}-${project.version}-${test.e2e.env}-${test.e2e.browser-ref}</finalName>
                     </configuration>
                     <executions>
                         <execution>

diff --git a/scada-lts-e2e-app/pom.xml b/scada-lts-e2e-app/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.scadalts</groupId>
         <artifactId>scada-lts-e2e</artifactId>
-        <version>23.0.7-SNAPSHOT</version>
+        <version>23.0.9-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/scada-lts-e2e-cli/pom.xml b/scada-lts-e2e-cli/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.scadalts</groupId>
         <artifactId>scada-lts-e2e</artifactId>
-        <version>23.0.7-SNAPSHOT</version>
+        <version>23.0.9-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/scada-lts-e2e-common/pom.xml b/scada-lts-e2e-common/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>scada-lts-e2e</artifactId>
         <groupId>org.scadalts</groupId>
-        <version>23.0.7-SNAPSHOT</version>
+        <version>23.0.9-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>scada-lts-e2e-common</artifactId>

diff --git a/scada-lts-e2e-common/scada-lts-e2e-common-api/pom.xml b/scada-lts-e2e-common/scada-lts-e2e-common-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>scada-lts-e2e-common</artifactId>
         <groupId>org.scadalts</groupId>
-        <version>23.0.7-SNAPSHOT</version>
+        <version>23.0.9-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>

diff --git a/scada-lts-e2e-common/scada-lts-e2e-common-core/pom.xml b/scada-lts-e2e-common/scada-lts-e2e-common-core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>scada-lts-e2e-common</artifactId>
         <groupId>org.scadalts</groupId>
-        <version>23.0.7-SNAPSHOT</version>
+        <version>23.0.9-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>

diff --git a/...cada-lts-e2e-common-core/src/main/java/org/scadalts/e2e/common/core/config/E2eConfig.java b/...cada-lts-e2e-common-core/src/main/java/org/scadalts/e2e/common/core/config/E2eConfig.java
@@ -98,6 +98,7 @@ public interface E2eConfig {
 
     boolean isScreenshotMode();
 
+    @Deprecated
     boolean isDriverManagerMode();
 
     boolean isContinuousMode();

diff --git a/scada-lts-e2e-common/scada-lts-e2e-common-impl/pom.xml b/scada-lts-e2e-common/scada-lts-e2e-common-impl/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>scada-lts-e2e-common</artifactId>
         <groupId>org.scadalts</groupId>
-        <version>23.0.7-SNAPSHOT</version>
+        <version>23.0.9-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>

diff --git a/scada-lts-e2e-page/pom.xml b/scada-lts-e2e-page/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>scada-lts-e2e</artifactId>
         <groupId>org.scadalts</groupId>
-        <version>23.0.7-SNAPSHOT</version>
+        <version>23.0.9-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/scada-lts-e2e-page/scada-lts-e2e-page-api/pom.xml b/scada-lts-e2e-page/scada-lts-e2e-page-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>scada-lts-e2e-page</artifactId>
         <groupId>org.scadalts</groupId>
-        <version>23.0.7-SNAPSHOT</version>
+        <version>23.0.9-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>scada-lts-e2e-page-api</artifactId>

diff --git a/scada-lts-e2e-page/scada-lts-e2e-page-core/pom.xml b/scada-lts-e2e-page/scada-lts-e2e-page-core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>scada-lts-e2e-page</artifactId>
         <groupId>org.scadalts</groupId>
-        <version>23.0.7-SNAPSHOT</version>
+        <version>23.0.9-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/...e2e-page-core/src/main/java/org/scadalts/e2e/page/core/config/PageObjectConfigurator.java b/...e2e-page-core/src/main/java/org/scadalts/e2e/page/core/config/PageObjectConfigurator.java
@@ -33,7 +33,7 @@ public static void init(E2eConfig config) {
         Configuration.baseUrl = config.getUrlAppBeingTested().toString();
         Configuration.browser = config.getBrowserRef().name().toLowerCase();
         Configuration.pageLoadStrategy = config.getPageLoadStrategy().name().toLowerCase();
-        Configuration.driverManagerEnabled = config.isDriverManagerMode();
+        //Configuration.driverManagerEnabled = config.isDriverManagerMode();
         Configuration.screenshots = config.isScreenshotMode();
         Configuration.headless = config.isHeadlessMode();
         Configuration.reportsUrl = config.getReportsUrl() == null ? null : config.getReportsUrl().toString();
@@ -104,7 +104,7 @@ private static void _initDefault() {
         Configuration.baseUrl = E2eConfiguration.baseUrl.toString();
         Configuration.browser = "chrome";
         Configuration.pageLoadStrategy = "normal";
-        Configuration.driverManagerEnabled = false;
+        //Configuration.driverManagerEnabled = false;
         Configuration.screenshots = true;
         Configuration.headless = false;
         Configuration.reportsUrl = "";

diff --git a/scada-lts-e2e-page/scada-lts-e2e-page-impl/pom.xml b/scada-lts-e2e-page/scada-lts-e2e-page-impl/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>scada-lts-e2e-page</artifactId>
         <groupId>org.scadalts</groupId>
-        <version>23.0.7-SNAPSHOT</version>
+        <version>23.0.9-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>scada-lts-e2e-page-impl</artifactId>

diff --git a/...age/scada-lts-e2e-page-impl/src/main/java/org/scadalts/e2e/page/impl/pages/LoginPage.java b/...age/scada-lts-e2e-page-impl/src/main/java/org/scadalts/e2e/page/impl/pages/LoginPage.java
@@ -71,7 +71,8 @@ public LoginPage setPassword(String password) {
 
     public NavigationPage login() {
         this.loginButton.click();
-        return page(NavigationPage.openPage());
+        printCurrentUrl();
+        return NavigationPage.openPage(getCurrentUrl());
     }
 
     public static String getUrlRef() {

diff --git a/...e-page-impl/src/main/java/org/scadalts/e2e/page/impl/pages/navigation/NavigationPage.java b/...e-page-impl/src/main/java/org/scadalts/e2e/page/impl/pages/navigation/NavigationPage.java
@@ -88,7 +88,10 @@ public interface NavigationPage extends PageObject<NavigationPage>, PageClosable
 
     static NavigationPage openPage() {
         return open(URL_REF, NavigationPageImpl.class);
-               // .acceptAlertOnPage();
+    }
+
+    static NavigationPage openPage(String url) {
+        return open(url, NavigationPageImpl.class);
     }
 
     static NavigationPage openRootPage() {

diff --git a/scada-lts-e2e-service/pom.xml b/scada-lts-e2e-service/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>scada-lts-e2e</artifactId>
         <groupId>org.scadalts</groupId>
-        <version>23.0.7-SNAPSHOT</version>
+        <version>23.0.9-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/scada-lts-e2e-service/scada-lts-e2e-service-api/pom.xml b/scada-lts-e2e-service/scada-lts-e2e-service-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>scada-lts-e2e-service</artifactId>
         <groupId>org.scadalts</groupId>
-        <version>23.0.7-SNAPSHOT</version>
+        <version>23.0.9-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/scada-lts-e2e-service/scada-lts-e2e-service-core/pom.xml b/scada-lts-e2e-service/scada-lts-e2e-service-core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>scada-lts-e2e-service</artifactId>
         <groupId>org.scadalts</groupId>
-        <version>23.0.7-SNAPSHOT</version>
+        <version>23.0.9-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/scada-lts-e2e-service/scada-lts-e2e-service-impl/pom.xml b/scada-lts-e2e-service/scada-lts-e2e-service-impl/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>scada-lts-e2e-service</artifactId>
         <groupId>org.scadalts</groupId>
-        <version>23.0.7-SNAPSHOT</version>
+        <version>23.0.9-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/scada-lts-e2e-test/pom.xml b/scada-lts-e2e-test/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>scada-lts-e2e</artifactId>
         <groupId>org.scadalts</groupId>
-        <version>23.0.7-SNAPSHOT</version>
+        <version>23.0.9-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/scada-lts-e2e-test/scada-lts-e2e-test-api/pom.xml b/scada-lts-e2e-test/scada-lts-e2e-test-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.scadalts</groupId>
         <artifactId>scada-lts-e2e-test</artifactId>
-        <version>23.0.7-SNAPSHOT</version>
+        <version>23.0.9-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/scada-lts-e2e-test/scada-lts-e2e-test-core/pom.xml b/scada-lts-e2e-test/scada-lts-e2e-test-core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>scada-lts-e2e-test</artifactId>
         <groupId>org.scadalts</groupId>
-        <version>23.0.7-SNAPSHOT</version>
+        <version>23.0.9-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/scada-lts-e2e-test/scada-lts-e2e-test-impl/pom.xml b/scada-lts-e2e-test/scada-lts-e2e-test-impl/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>scada-lts-e2e-test</artifactId>
         <groupId>org.scadalts</groupId>
-        <version>23.0.7-SNAPSHOT</version>
+        <version>23.0.9-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/...scada-lts-e2e-test-impl/src/main/java/org/scadalts/e2e/test/impl/groovy/GroovyEngine.java b/...scada-lts-e2e-test-impl/src/main/java/org/scadalts/e2e/test/impl/groovy/GroovyEngine.java
@@ -59,7 +59,11 @@ public void after() {
 
     @AfterClass
     public static void clean() {
-        _clean();
+        try {
+            _clean();
+        } finally {
+            System.gc();
+        }
     }
 
     private static void _clean() {
@@ -73,7 +77,6 @@ private static void _clean() {
             if(TestWithoutPageUtil.isApiLogged())
                 TestWithoutPageUtil.close();
         }
-        System.gc();
     }
 
     private void _preconfig(GroovyExecute execute) {

diff --git a/...-test-impl/src/main/java/org/scadalts/e2e/test/impl/tests/check/login/LoginCheckTest.java b/...-test-impl/src/main/java/org/scadalts/e2e/test/impl/tests/check/login/LoginCheckTest.java
@@ -26,7 +26,7 @@ public void clean() {
     public void test_login() {
 
         //when:
-        NavigationPage navigationPage = TestWithPageUtil.openNavigationPage();
+        NavigationPage navigationPage = TestWithPageUtil.openNavigationPage().acceptAlertOnPageSlow().waitOnPage(500);
 
         //and:
         String userName = navigationPage.getUserName();