add good driver validation function. fix safari issue (#3375)

* add good driver validation function. fix safari issue * add path safaridriver
jdi-testing · Oct 6, 2021 · 18a15dd · 18a15dd
1 parent fbe85c3
commit 18a15dd
Show file tree

Hide file tree

Showing 41 changed files with 79 additions and 71 deletions.
diff --git a/jdi-bdd-tests/pom.xml b/jdi-bdd-tests/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.epam.jdi</groupId>
     <artifactId>jdi-bdd-tests</artifactId>
-    <version>1.3.16</version>
+    <version>1.3.17</version>
     <name>Tests: JDI BDD</name>
 
     <properties>
@@ -22,7 +22,7 @@
         <dependency>
             <groupId>com.epam.jdi</groupId>
             <artifactId>jdi-bdd</artifactId>
-            <version>1.3.16</version>
+            <version>1.3.17</version>
         </dependency>
         <dependency>
             <groupId>info.cukes</groupId>

diff --git a/jdi-bdd/pom.xml b/jdi-bdd/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.epam.jdi</groupId>
     <artifactId>jdi-bdd</artifactId>
-    <version>1.3.16</version>
+    <version>1.3.17</version>
     <name>JDI BDD</name>
 
     <properties>
@@ -18,7 +18,7 @@
         <dependency>
             <groupId>com.epam.jdi</groupId>
             <artifactId>jdi-light-html</artifactId>
-            <version>1.3.16</version>
+            <version>1.3.17</version>
         </dependency>
         <dependency>
             <groupId>info.cukes</groupId>

diff --git a/jdi-eyes-demo/pom.xml b/jdi-eyes-demo/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.epam.jdi</groupId>
     <artifactId>jdi-eyes-demo</artifactId>
-    <version>1.3.16</version>
+    <version>1.3.17</version>
     <name>Selenium to JDI Example with Eyes</name>
     <packaging>jar</packaging>
 
@@ -23,12 +23,12 @@
         <dependency>
             <groupId>com.epam.jdi</groupId>
             <artifactId>jdi-light-eyes</artifactId>
-            <version>1.3.16</version>
+            <version>1.3.17</version>
         </dependency>
         <dependency>
             <groupId>com.epam.jdi</groupId>
             <artifactId>jdi-light-html</artifactId>
-            <version>1.3.16</version>
+            <version>1.3.17</version>
         </dependency>
 
         <dependency>

diff --git a/jdi-light-angular-tests-with-mocks/pom.xml b/jdi-light-angular-tests-with-mocks/pom.xml
@@ -6,7 +6,7 @@
 
     <artifactId>jdi-light-angular-tests-with-mocks</artifactId>
     <name>Tests: JDI Angular unit tests with mocks</name>
-    <version>1.3.16</version>
+    <version>1.3.17</version>
     <groupId>com.epam.jdi</groupId>
 
     <properties>
@@ -28,7 +28,7 @@
         <dependency>
             <groupId>com.epam.jdi</groupId>
             <artifactId>jdi-light-angular</artifactId>
-            <version>1.3.16</version>
+            <version>1.3.17</version>
         </dependency>
 
         <dependency>

diff --git a/jdi-light-angular-tests/pom.xml b/jdi-light-angular-tests/pom.xml
@@ -6,7 +6,7 @@
 
     <artifactId>jdi-light-angular-tests</artifactId>
     <name>Tests: JDI Angular</name>
-    <version>1.3.16</version>
+    <version>1.3.17</version>
     <groupId>com.epam.jdi</groupId>
 
     <properties>
@@ -23,7 +23,7 @@
         <dependency>
             <groupId>com.epam.jdi</groupId>
             <artifactId>jdi-light-angular</artifactId>
-            <version>1.3.16</version>
+            <version>1.3.17</version>
         </dependency>
         <dependency>
             <groupId>io.qameta.allure</groupId>

diff --git a/...r-tests/src/test/java/io/github/epam/angular/tests/elements/complex/RadioButtonTests.java b/...r-tests/src/test/java/io/github/epam/angular/tests/elements/complex/RadioButtonTests.java
@@ -8,7 +8,6 @@
 import static io.github.com.StaticSite.angularPage;
 import static io.github.com.pages.sections.RadioButtonSection.*;
 import static io.github.epam.site.steps.States.shouldBeLoggedIn;
-import static com.jdiai.tools.StringUtils.format;
 
 public class RadioButtonTests extends TestsInit {
     private static final String SPRING = "Spring";

diff --git a/.../src/test/java/io/github/epam/angular/tests/elements/complex/tabgroup/TabsBasicTests.java b/.../src/test/java/io/github/epam/angular/tests/elements/complex/tabgroup/TabsBasicTests.java
@@ -4,7 +4,6 @@
 
 import static com.jdiai.tools.StringUtils.format;
 import static io.github.com.pages.AngularPage.tabsSection;
-import static com.jdiai.tools.StringUtils.format;
 
 public class TabsBasicTests extends TestsTabGroupBase {
 

diff --git a/...github/epam/angular/tests/elements/complex/tabgroup/TabsWIthAsyncLoadingContentTests.java b/...github/epam/angular/tests/elements/complex/tabgroup/TabsWIthAsyncLoadingContentTests.java
@@ -4,7 +4,6 @@
 
 import static com.jdiai.tools.StringUtils.format;
 import static io.github.com.pages.AngularPage.tabsSection;
-import static com.jdiai.tools.StringUtils.format;
 
 public class TabsWIthAsyncLoadingContentTests extends TestsTabGroupBase {
 

diff --git a/.../github/epam/angular/tests/elements/complex/tabgroup/TabsWihLazilyLoadedContentTests.java b/.../github/epam/angular/tests/elements/complex/tabgroup/TabsWihLazilyLoadedContentTests.java
@@ -9,7 +9,6 @@
 import static com.epam.jdi.light.elements.composite.WebPage.refresh;
 import static com.jdiai.tools.StringUtils.format;
 import static io.github.com.pages.AngularPage.tabsSection;
-import static com.jdiai.tools.StringUtils.format;
 
 public class TabsWihLazilyLoadedContentTests extends TestsTabGroupBase {
 

diff --git a/...github/epam/angular/tests/elements/complex/tabgroup/TabsWithCustomLabelTemplateTests.java b/...github/epam/angular/tests/elements/complex/tabgroup/TabsWithCustomLabelTemplateTests.java
@@ -7,7 +7,6 @@
 
 import static com.jdiai.tools.StringUtils.format;
 import static io.github.com.pages.AngularPage.tabsSection;
-import static com.jdiai.tools.StringUtils.format;
 
 public class TabsWithCustomLabelTemplateTests extends TestsTabGroupBase {
 

diff --git a/...o/github/epam/angular/tests/elements/complex/tabgroup/TabsWithCustomizingThemesTests.java b/...o/github/epam/angular/tests/elements/complex/tabgroup/TabsWithCustomizingThemesTests.java
@@ -4,7 +4,6 @@
 
 import static com.jdiai.tools.StringUtils.format;
 import static io.github.com.pages.AngularPage.tabsSection;
-import static com.jdiai.tools.StringUtils.format;
 
 public class TabsWithCustomizingThemesTests extends TestsTabGroupBase {
 

diff --git a/...ub/epam/angular/tests/elements/complex/tabgroup/TabsWithDynamicallyChangingTabsTests.java b/...ub/epam/angular/tests/elements/complex/tabgroup/TabsWithDynamicallyChangingTabsTests.java
@@ -7,7 +7,6 @@
 
 import static com.jdiai.tools.StringUtils.format;
 import static io.github.com.pages.AngularPage.tabsSection;
-import static com.jdiai.tools.StringUtils.format;
 
 public class TabsWithDynamicallyChangingTabsTests extends TestsTabGroupBase {
 

diff --git a/.../github/epam/angular/tests/elements/complex/tabgroup/TabsWithHeadersOnTheBottomTests.java b/.../github/epam/angular/tests/elements/complex/tabgroup/TabsWithHeadersOnTheBottomTests.java
@@ -4,7 +4,6 @@
 
 import static com.jdiai.tools.StringUtils.format;
 import static io.github.com.pages.AngularPage.tabsSection;
-import static com.jdiai.tools.StringUtils.format;
 
 public class TabsWithHeadersOnTheBottomTests extends TestsTabGroupBase {
 

diff --git a/...test/java/io/github/epam/angular/tests/elements/complex/tabgroup/TabsWithNavBarTests.java b/...test/java/io/github/epam/angular/tests/elements/complex/tabgroup/TabsWithNavBarTests.java
@@ -8,7 +8,6 @@
 
 import static com.jdiai.tools.StringUtils.format;
 import static io.github.com.pages.AngularPage.tabsSection;
-import static com.jdiai.tools.StringUtils.format;
 
 public class TabsWithNavBarTests extends TestsTabGroupBase {
 

diff --git a/...r-tests/src/test/java/io/github/epam/angular/tests/unit/DatepickerContainerUnitTests.java b/...r-tests/src/test/java/io/github/epam/angular/tests/unit/DatepickerContainerUnitTests.java
@@ -22,7 +22,6 @@
 import static io.github.epam.site.steps.States.shouldBeLoggedIn;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertTrue;
-import static com.jdiai.tools.StringUtils.format;
 
 public class DatepickerContainerUnitTests extends TestsInit {
     private DatepickerContainer container;

diff --git a/...ht-angular-tests/src/test/java/io/github/epam/angular/tests/unit/DatepickerUnitTests.java b/...ht-angular-tests/src/test/java/io/github/epam/angular/tests/unit/DatepickerUnitTests.java
@@ -21,7 +21,6 @@
 import static io.github.epam.site.steps.States.shouldBeLoggedIn;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertTrue;
-import static com.jdiai.tools.StringUtils.format;
 
 public class DatepickerUnitTests extends TestsInit {
     @BeforeMethod(alwaysRun = true)

diff --git a/...ght-angular-tests/src/test/java/io/github/epam/angular/tests/unit/PaginatorUnitTests.java b/...ght-angular-tests/src/test/java/io/github/epam/angular/tests/unit/PaginatorUnitTests.java
@@ -15,7 +15,6 @@
 import static io.github.com.pages.sections.PaginatorSection.*;
 import static io.github.epam.site.steps.States.shouldBeLoggedIn;
 import static org.testng.Assert.*;
-import static com.jdiai.tools.StringUtils.format;
 
 public class PaginatorUnitTests extends TestsInit {
 

diff --git a/...ight-angular-tests/src/test/java/io/github/epam/angular/tests/unit/TabGroupUnitTests.java b/...ight-angular-tests/src/test/java/io/github/epam/angular/tests/unit/TabGroupUnitTests.java
@@ -12,7 +12,6 @@
 import static io.github.com.pages.AngularPage.tabsSection;
 import static io.github.epam.site.steps.States.shouldBeLoggedIn;
 import static org.testng.Assert.assertTrue;
-import static com.jdiai.tools.StringUtils.format;
 
 public class TabGroupUnitTests extends TestsInit {
 

diff --git a/jdi-light-angular/pom.xml b/jdi-light-angular/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>jdi-light-angular</artifactId>
     <packaging>jar</packaging>
     <name>JDI Angular</name>
-    <version>1.3.16</version>
+    <version>1.3.17</version>
     <groupId>com.epam.jdi</groupId>
 
     <properties>
@@ -23,7 +23,7 @@
         <dependency>
             <groupId>com.epam.jdi</groupId>
             <artifactId>jdi-light-html</artifactId>
-            <version>1.3.16</version>
+            <version>1.3.17</version>
         </dependency>
     </dependencies>
 

diff --git a/jdi-light-applitools-tests/pom.xml b/jdi-light-applitools-tests/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>jdi-light-applitools-tests</artifactId>
     <name>Tests: JDI Light Applitools Eyes</name>
     <packaging>jar</packaging>
-    <version>1.3.16</version>
+    <version>1.3.17</version>
     <groupId>com.epam.jdi</groupId>
 
     <properties>
@@ -26,12 +26,12 @@
         <dependency>
             <groupId>com.epam.jdi</groupId>
             <artifactId>jdi-light-html</artifactId>
-            <version>1.3.16</version>
+            <version>1.3.17</version>
         </dependency>
         <dependency>
             <groupId>com.epam.jdi</groupId>
             <artifactId>jdi-light-eyes</artifactId>
-            <version>1.3.16</version>
+            <version>1.3.17</version>
         </dependency>
         <dependency>
             <groupId>io.qameta.allure</groupId>

diff --git a/jdi-light-bootstrap-tests/pom.xml b/jdi-light-bootstrap-tests/pom.xml
@@ -4,7 +4,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <version>1.3.16</version>
+    <version>1.3.17</version>
     <artifactId>jdi-light-bootstrap-tests</artifactId>
     <name>Tests: JDI Bootstrap</name>
     <groupId>com.epam.jdi</groupId>
@@ -23,7 +23,7 @@
         <dependency>
             <groupId>com.epam.jdi</groupId>
             <artifactId>jdi-light-bootstrap</artifactId>
-            <version>1.3.16</version>
+            <version>1.3.17</version>
         </dependency>
 
         <!--Allure config in parent-->

diff --git a/jdi-light-bootstrap/pom.xml b/jdi-light-bootstrap/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>jdi-light-bootstrap</artifactId>
     <name>JDI Light Bootstrap Elements</name>
     <packaging>jar</packaging>
-    <version>1.3.16</version>
+    <version>1.3.17</version>
     <groupId>com.epam.jdi</groupId>
 
     <properties>
@@ -20,7 +20,7 @@
         <dependency>
             <groupId>com.epam.jdi</groupId>
             <artifactId>jdi-light-html</artifactId>
-            <version>1.3.16</version>
+            <version>1.3.17</version>
         </dependency>
      </dependencies>
 

diff --git a/jdi-light-eyes/pom.xml b/jdi-light-eyes/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>jdi-light-eyes</artifactId>
     <name>JDI Light Applitools Eyes</name>
     <packaging>jar</packaging>
-    <version>1.3.16</version>
+    <version>1.3.17</version>
     <groupId>com.epam.jdi</groupId>
 
     <properties>
@@ -19,7 +19,7 @@
         <dependency>
             <groupId>com.epam.jdi</groupId>
             <artifactId>jdi-light</artifactId>
-            <version>1.3.16</version>
+            <version>1.3.17</version>
         </dependency>
 
         <!-- Applitools SDK -->

diff --git a/jdi-light-html-tests/pom.xml b/jdi-light-html-tests/pom.xml
@@ -4,7 +4,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <version>1.3.16</version>
+    <version>1.3.17</version>
     <artifactId>jdi-light-html-tests</artifactId>
     <name>Tests: JDI Html</name>
     <groupId>com.epam.jdi</groupId>
@@ -26,7 +26,7 @@
         <dependency>
             <groupId>com.epam.jdi</groupId>
             <artifactId>jdi-light-html</artifactId>
-            <version>1.3.16</version>
+            <version>1.3.17</version>
         </dependency>
 
         <!--Allure config in parent-->

diff --git a/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/site/steps/States.java b/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/site/steps/States.java
@@ -22,13 +22,15 @@ public static void shouldBeLoggedIn() {
     }
     @Step
     public static void moveToHomePage() {
-        if (!verifyUrl("https://jdi-testing.github.io/jdi-light/") || epamLogo.isNotExist())
+        if (!verifyUrl("https://jdi-testing.github.io/jdi-light/") || epamLogo.isNotExist()) {
             homePage.open();
+        }
     }
     @Step
     public static void login() {
-        if (loginForm.isHidden())
+        if (loginForm.isHidden()) {
             userIcon.click();
+        }
         loginForm.is().displayed();
         loginForm.submit(DEFAULT_USER);
         userName.has().text("ROMAN IOVLEV");

diff --git a/jdi-light-html/pom.xml b/jdi-light-html/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>jdi-light-html</artifactId>
     <name>JDI Light Html Elements</name>
     <packaging>jar</packaging>
-    <version>1.3.16</version>
+    <version>1.3.17</version>
     <groupId>com.epam.jdi</groupId>
 
     <properties>
@@ -20,7 +20,7 @@
         <dependency>
             <groupId>com.epam.jdi</groupId>
             <artifactId>jdi-light</artifactId>
-            <version>1.3.16</version>
+            <version>1.3.17</version>
         </dependency>
     </dependencies>
 

diff --git a/jdi-light-mobile-bootstrap-web-tests/pom.xml b/jdi-light-mobile-bootstrap-web-tests/pom.xml
@@ -4,7 +4,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <version>1.3.16</version>
+    <version>1.3.17</version>
     <artifactId>jdi-light-mobile-bootstrap-web-tests</artifactId>
     <name>Tests: JDI Mobile Bootstrap Web tests</name>
     <groupId>com.epam.jdi</groupId>
@@ -17,7 +17,7 @@
         <allure.maven>2.10.0</allure.maven>
         <jetty.version>9.4.12.RC2</jetty.version>
         <aspectj.version>1.9.7</aspectj.version>
-        <jdi.version>1.3.16</jdi.version>
+        <jdi.version>1.3.17</jdi.version>
         <suite.xml.file>src/test/resources/demoRun.xml</suite.xml.file>
         <suite.xml.file>src/test/resources/general.xml</suite.xml.file>
     </properties>

diff --git a/jdi-light-mobile-html-web-tests/pom.xml b/jdi-light-mobile-html-web-tests/pom.xml
@@ -4,7 +4,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <version>1.3.16</version>
+    <version>1.3.17</version>
     <artifactId>jdi-light-mobile-html-web-tests</artifactId>
     <name>Tests: JDI Mobile HTML Web</name>
     <groupId>com.epam.jdi</groupId>
@@ -17,7 +17,7 @@
         <allure.maven>2.10.0</allure.maven>
         <jetty.version>9.4.12.RC2</jetty.version>
         <aspectj.version>1.9.7</aspectj.version>
-        <jdi.version>1.3.16</jdi.version>
+        <jdi.version>1.3.17</jdi.version>
         <suite.xml.file>src/test/resources/demoRun.xml</suite.xml.file>
         <suite.xml.file>src/test/resources/general.xml</suite.xml.file>
     </properties>