Skip to content

Commit

Permalink
Merge branch 'refs/heads/master' into angular_rework_development
Browse files Browse the repository at this point in the history
  • Loading branch information
pnatashap committed Apr 6, 2024
2 parents 2c0d24e + c3f7857 commit 8955cee
Show file tree
Hide file tree
Showing 42 changed files with 76 additions and 305 deletions.
8 changes: 4 additions & 4 deletions jdi-bdd-tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@

<groupId>com.epam.jdi</groupId>
<artifactId>jdi-bdd-tests</artifactId>
<version>1.5.3-SNAPSHOT</version>
<version>1.5.4-SNAPSHOT</version>
<name>Tests: JDI BDD</name>

<properties>
<jdi.version>1.5.3-SNAPSHOT</jdi.version>
<jdi.version>1.5.4-SNAPSHOT</jdi.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<driver>chrome</driver>
<jetty.version>9.4.12.RC2</jetty.version>
Expand Down Expand Up @@ -44,12 +44,12 @@
<dependency>
<groupId>io.cucumber</groupId>
<artifactId>cucumber-junit</artifactId>
<version>7.10.1</version>
<version>7.16.1</version>
</dependency>
<dependency>
<groupId>io.qameta.allure</groupId>
<artifactId>allure-cucumber7-jvm</artifactId>
<version>2.20.1</version>
<version>2.26.0</version>
</dependency>
<dependency>
<groupId>io.qameta.allure</groupId>
Expand Down
8 changes: 4 additions & 4 deletions jdi-bdd/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@

<groupId>com.epam.jdi</groupId>
<artifactId>jdi-bdd</artifactId>
<version>1.5.3-SNAPSHOT</version>
<version>1.5.4-SNAPSHOT</version>
<name>JDI BDD</name>
<url>https://github.com/jdi-testing</url>
<description>JDI Light BDD library</description>

<properties>
<jdi.version>1.5.3-SNAPSHOT</jdi.version>
<jdi.version>1.5.4-SNAPSHOT</jdi.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>11</java.version>
<gpg.key></gpg.key>
Expand All @@ -28,12 +28,12 @@
<dependency>
<groupId>io.cucumber</groupId>
<artifactId>cucumber-java</artifactId>
<version>7.13.0</version>
<version>7.16.1</version>
</dependency>
<dependency>
<groupId>io.cucumber</groupId>
<artifactId>gherkin</artifactId>
<version>26.2.0</version>
<version>28.0.0</version>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
Expand Down
4 changes: 2 additions & 2 deletions jdi-eyes-demo/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@

<groupId>com.epam.jdi</groupId>
<artifactId>jdi-eyes-demo</artifactId>
<version>1.5.3-SNAPSHOT</version>
<version>1.5.4-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Selenium to JDI Example with Eyes</name>

<properties>
<jdi.version>1.5.3-SNAPSHOT</jdi.version>
<jdi.version>1.5.4-SNAPSHOT</jdi.version>
<driver>chrome</driver>
<domain>https://jdi-testing.github.io/jdi-light/</domain>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand Down
4 changes: 2 additions & 2 deletions jdi-light-angular-tests-with-mocks/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@

<groupId>com.epam.jdi</groupId>
<artifactId>jdi-light-angular-tests-with-mocks</artifactId>
<version>1.5.3-SNAPSHOT</version>
<version>1.5.4-SNAPSHOT</version>
<name>Tests: JDI Angular unit tests with mocks</name>

<properties>
<jdi.version>1.5.3-SNAPSHOT</jdi.version>
<jdi.version>1.5.4-SNAPSHOT</jdi.version>
<driver>chrome</driver>
<aspectj.version>1.9.20</aspectj.version>
<java.version>11</java.version>
Expand Down
4 changes: 2 additions & 2 deletions jdi-light-angular-tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@

<groupId>com.epam.jdi</groupId>
<artifactId>jdi-light-angular-tests</artifactId>
<version>1.5.3-SNAPSHOT</version>
<version>1.5.4-SNAPSHOT</version>
<name>Tests: JDI Angular</name>

<properties>
<jdi.version>1.5.3-SNAPSHOT</jdi.version>
<jdi.version>1.5.4-SNAPSHOT</jdi.version>
<driver>chrome</driver>
<aspectj.version>1.9.20</aspectj.version>
<java.version>11</java.version>
Expand Down
4 changes: 2 additions & 2 deletions jdi-light-angular/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@

<groupId>com.epam.jdi</groupId>
<artifactId>jdi-light-angular</artifactId>
<version>1.5.3-SNAPSHOT</version>
<version>1.5.4-SNAPSHOT</version>
<packaging>jar</packaging>
<name>JDI Light Angular</name>
<url>https://github.com/jdi-testing</url>
<description>JDI Light Angular library</description>

<properties>
<jdi.version>1.5.3-SNAPSHOT</jdi.version>
<jdi.version>1.5.4-SNAPSHOT</jdi.version>
<aspectj.version>1.9.20</aspectj.version>
<aspectj.maven>1.14.0</aspectj.maven>
<java.version>11</java.version>
Expand Down
4 changes: 2 additions & 2 deletions jdi-light-applitools-tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@

<groupId>com.epam.jdi</groupId>
<artifactId>jdi-light-applitools-tests</artifactId>
<version>1.5.3-SNAPSHOT</version>
<version>1.5.4-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Tests: JDI Light Applitools Eyes</name>

<properties>
<jdi.version>1.5.3-SNAPSHOT</jdi.version>
<jdi.version>1.5.4-SNAPSHOT</jdi.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>11</java.version>
<applitools.version>3.157.10</applitools.version>
Expand Down
4 changes: 2 additions & 2 deletions jdi-light-bootstrap-tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@

<groupId>com.epam.jdi</groupId>
<artifactId>jdi-light-bootstrap-tests</artifactId>
<version>1.5.3-SNAPSHOT</version>
<version>1.5.4-SNAPSHOT</version>
<name>Tests: JDI Bootstrap</name>

<properties>
<jdi.version>1.5.3-SNAPSHOT</jdi.version>
<jdi.version>1.5.4-SNAPSHOT</jdi.version>
<driver>chrome</driver>
<!--driver>firefox</driver-->
<allure.maven>2.12.0</allure.maven>
Expand Down
4 changes: 2 additions & 2 deletions jdi-light-bootstrap/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@

<groupId>com.epam.jdi</groupId>
<artifactId>jdi-light-bootstrap</artifactId>
<version>1.5.3-SNAPSHOT</version>
<version>1.5.4-SNAPSHOT</version>
<packaging>jar</packaging>
<name>JDI Light Bootstrap Elements</name>
<url>https://github.com/jdi-testing</url>
<description>JDI Light Bootstrap library</description>

<properties>
<jdi.version>1.5.3-SNAPSHOT</jdi.version>
<jdi.version>1.5.4-SNAPSHOT</jdi.version>
<aspectj.version>1.9.20</aspectj.version>
<aspectj.maven>1.14.0</aspectj.maven>
<java.version>11</java.version>
Expand Down
16 changes: 8 additions & 8 deletions jdi-light-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>com.epam.jdi</groupId>
<artifactId>jdi-light-core</artifactId>
<version>1.5.3-SNAPSHOT</version>
<version>1.5.4-SNAPSHOT</version>
<packaging>jar</packaging>
<name>JDI Light Core</name>
<url>https://github.com/jdi-testing</url>
Expand All @@ -17,30 +17,30 @@
<aspectj.version>1.9.20</aspectj.version>
<aspectj.maven>1.14.0</aspectj.maven>
<java.version>11</java.version>
<allure.version>2.25.0</allure.version>
<allure.version>2.26.0</allure.version>
<gpg.key></gpg.key>
</properties>

<dependencies>
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-java</artifactId>
<version>4.18.1</version>
<version>4.19.1</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.16.0</version>
<version>2.17.0</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.15.1</version>
<version>2.16.0</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
<version>1.26.0</version>
<version>1.26.1</version>
</dependency>
<dependency>
<groupId>com.jdiai.tools</groupId>
Expand All @@ -66,7 +66,7 @@
<dependency>
<groupId>io.github.bonigarcia</groupId>
<artifactId>webdrivermanager</artifactId>
<version>5.7.0</version>
<version>5.8.0</version>
<exclusions>
<exclusion>
<groupId>com.github.docker-java</groupId>
Expand Down Expand Up @@ -100,7 +100,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>33.0.0-jre</version>
<version>33.1.0-jre</version>
</dependency>
</dependencies>

Expand Down
4 changes: 2 additions & 2 deletions jdi-light-eyes/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@

<groupId>com.epam.jdi</groupId>
<artifactId>jdi-light-eyes</artifactId>
<version>1.5.3-SNAPSHOT</version>
<version>1.5.4-SNAPSHOT</version>
<packaging>jar</packaging>
<name>JDI Light Applitools Eyes</name>
<url>https://github.com/jdi-testing</url>
<description>JDI Light Eyes library</description>

<properties>
<jdi.version>1.5.3-SNAPSHOT</jdi.version>
<jdi.version>1.5.4-SNAPSHOT</jdi.version>
<java.version>11</java.version>
<applitools.version>3.210.6</applitools.version>
<gpg.key></gpg.key>
Expand Down
4 changes: 2 additions & 2 deletions jdi-light-html-tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@

<groupId>com.epam.jdi</groupId>
<artifactId>jdi-light-html-tests</artifactId>
<version>1.5.3-SNAPSHOT</version>
<version>1.5.4-SNAPSHOT</version>
<name>Tests: JDI Html</name>

<properties>
<jdi.version>1.5.3-SNAPSHOT</jdi.version>
<jdi.version>1.5.4-SNAPSHOT</jdi.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<driver>chrome</driver>
<validate.performance>false</validate.performance>
Expand Down
4 changes: 2 additions & 2 deletions jdi-light-html/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@

<groupId>com.epam.jdi</groupId>
<artifactId>jdi-light-html</artifactId>
<version>1.5.3-SNAPSHOT</version>
<version>1.5.4-SNAPSHOT</version>
<packaging>jar</packaging>
<name>JDI Light Html Elements</name>
<url>https://github.com/jdi-testing</url>
<description>JDI Light HTML5 library</description>

<properties>
<jdi.version>1.5.3-SNAPSHOT</jdi.version>
<jdi.version>1.5.4-SNAPSHOT</jdi.version>
<aspectj.version>1.9.20</aspectj.version>
<aspectj.maven>1.14.0</aspectj.maven>
<java.version>11</java.version>
Expand Down
4 changes: 2 additions & 2 deletions jdi-light-material-ui-tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<artifactId>jdi-light-material-ui-tests</artifactId>
<name>Tests: JDI Material UI</name>
<version>1.5.3-SNAPSHOT</version>
<version>1.5.4-SNAPSHOT</version>
<groupId>com.epam.jdi</groupId>

<properties>
Expand All @@ -16,7 +16,7 @@
<allure.testng>2.25.0</allure.testng>
<allure.maven>2.12.0</allure.maven>
<jetty.version>9.4.12.RC2</jetty.version>
<jdi.version>1.5.3-SNAPSHOT</jdi.version>
<jdi.version>1.5.4-SNAPSHOT</jdi.version>
<suite-xml-file>src/test/resources/general.xml</suite-xml-file>
<testng.version>7.8.0</testng.version>
<!-- - - add-opens java.base/java.lang=ALL-UNNAMED is needed for JDK 16+ -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@
import io.github.com.pages.utils.PopoverPage;
import io.github.com.pages.utils.PopperPage;
import io.github.com.pages.utils.TextAreaAutoSizePage;
import io.github.com.pages.utils.TransitionPage;
import io.github.com.pages.utils.UseMediaQueryPage;

@JSite("https://jdi-testing.github.io/jdi-light/material/")
Expand Down Expand Up @@ -234,10 +233,6 @@ public class StaticSite {
public static TabPage tabPage;


// transition
@Url("/transitions")
public static TransitionPage transitionPage;

// popover
@Url("/popover")
public static PopoverPage popoverPage;
Expand Down

This file was deleted.

This file was deleted.

Loading

0 comments on commit 8955cee

Please sign in to comment.