Skip to content

Commit

Permalink
Merge pull request #4791 from jdi-testing/release_1_4_10
Browse files Browse the repository at this point in the history
Release 1 4 10
  • Loading branch information
pnatashap authored Feb 17, 2023
2 parents 23bd461 + a622169 commit fb1dfa7
Show file tree
Hide file tree
Showing 25 changed files with 181 additions and 63 deletions.
4 changes: 2 additions & 2 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.4.10-SNAPSHOT</version>
<version>1.4.10</version>
<name>Tests: JDI BDD</name>

<properties>
<jdi.version>1.4.10-SNAPSHOT</jdi.version>
<jdi.version>1.4.10</jdi.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<driver>chrome</driver>
<jetty.version>9.4.12.RC2</jetty.version>
Expand Down
6 changes: 3 additions & 3 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.4.10-SNAPSHOT</version>
<version>1.4.10</version>
<name>JDI BDD</name>
<url>https://github.com/jdi-testing</url>
<description>JDI Light BDD library</description>

<properties>
<jdi.version>1.4.10-SNAPSHOT</jdi.version>
<jdi.version>1.4.10</jdi.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<gpg.key></gpg.key>
</properties>
Expand Down Expand Up @@ -42,7 +42,7 @@
<dependency>
<groupId>com.epam.jdi</groupId>
<artifactId>jdi-light</artifactId>
<version>1.4.10-SNAPSHOT</version>
<version>1.4.10</version>
<scope>compile</scope>
</dependency>
</dependencies>
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.4.10-SNAPSHOT</version>
<version>1.4.10</version>
<packaging>jar</packaging>
<name>Selenium to JDI Example with Eyes</name>

<properties>
<jdi.version>1.4.10-SNAPSHOT</jdi.version>
<jdi.version>1.4.10</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.4.10-SNAPSHOT</version>
<version>1.4.10</version>
<name>Tests: JDI Angular unit tests with mocks</name>

<properties>
<jdi.version>1.4.10-SNAPSHOT</jdi.version>
<jdi.version>1.4.10</jdi.version>
<driver>chrome</driver>
<aspectj.version>1.9.7</aspectj.version>
<java.version>1.8</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.4.10-SNAPSHOT</version>
<version>1.4.10</version>
<name>Tests: JDI Angular</name>

<properties>
<jdi.version>1.4.10-SNAPSHOT</jdi.version>
<jdi.version>1.4.10</jdi.version>
<driver>chrome</driver>
<aspectj.version>1.9.7</aspectj.version>
<java.version>1.8</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.4.10-SNAPSHOT</version>
<version>1.4.10</version>
<packaging>jar</packaging>
<name>JDI Angular</name>
<url>https://github.com/jdi-testing</url>
<description>JDI Light Angular library</description>

<properties>
<jdi.version>1.4.10-SNAPSHOT</jdi.version>
<jdi.version>1.4.10</jdi.version>
<aspectj.version>1.9.7</aspectj.version>
<aspectj.maven>1.14.0</aspectj.maven>
<java.version>1.8</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.4.10-SNAPSHOT</version>
<version>1.4.10</version>
<packaging>jar</packaging>
<name>Tests: JDI Light Applitools Eyes</name>

<properties>
<jdi.version>1.4.10-SNAPSHOT</jdi.version>
<jdi.version>1.4.10</jdi.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>1.8</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.4.10-SNAPSHOT</version>
<version>1.4.10</version>
<name>Tests: JDI Bootstrap</name>

<properties>
<jdi.version>1.4.10-SNAPSHOT</jdi.version>
<jdi.version>1.4.10</jdi.version>
<driver>chrome</driver>
<!--driver>firefox</driver-->
<allure.maven>2.10.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.4.10-SNAPSHOT</version>
<version>1.4.10</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.4.10-SNAPSHOT</jdi.version>
<jdi.version>1.4.10</jdi.version>
<aspectj.version>1.9.7</aspectj.version>
<aspectj.maven>1.14.0</aspectj.maven>
<java.version>1.8</java.version>
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.4.10-SNAPSHOT</version>
<version>1.4.10</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.4.10-SNAPSHOT</jdi.version>
<jdi.version>1.4.10</jdi.version>
<java.version>1.8</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.4.10-SNAPSHOT</version>
<version>1.4.10</version>
<name>Tests: JDI Html</name>

<properties>
<jdi.version>1.4.10-SNAPSHOT</jdi.version>
<jdi.version>1.4.10</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.4.10-SNAPSHOT</version>
<version>1.4.10</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.4.10-SNAPSHOT</jdi.version>
<jdi.version>1.4.10</jdi.version>
<aspectj.version>1.9.7</aspectj.version>
<aspectj.maven>1.14.0</aspectj.maven>
<java.version>1.8</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.4.10-SNAPSHOT</version>
<version>1.4.10</version>
<groupId>com.epam.jdi</groupId>

<properties>
Expand All @@ -16,7 +16,7 @@
<allure.testng>2.17.2</allure.testng>
<allure.maven>2.10.0</allure.maven>
<jetty.version>9.4.12.RC2</jetty.version>
<jdi.version>1.4.10-SNAPSHOT</jdi.version>
<jdi.version>1.4.10</jdi.version>
<suite-xml-file>src/test/resources/general.xml</suite-xml-file>
<log4j2.version>2.17.1</log4j2.version>
<!-- - - add-opens java.base/java.lang=ALL-UNNAMED is needed for JDK 16+ -->
Expand Down
4 changes: 2 additions & 2 deletions jdi-light-material-ui/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<artifactId>jdi-light-material-ui</artifactId>
<packaging>jar</packaging>
<name>JDI Material UI Elements v4</name>
<version>1.4.10-SNAPSHOT</version>
<version>1.4.10</version>
<groupId>com.epam.jdi</groupId>
<url>https://github.com/jdi-testing</url>
<description>JDI Light Material UI Elements library for version 4</description>
Expand All @@ -16,7 +16,7 @@
<aspectj.version>1.9.7</aspectj.version>
<aspectj.maven>1.14.0</aspectj.maven>
<java.version>1.8</java.version>
<jdi.version>1.4.10-SNAPSHOT</jdi.version>
<jdi.version>1.4.10</jdi.version>
</properties>

<dependencies>
Expand Down
4 changes: 2 additions & 2 deletions jdi-light-vuetify-tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<artifactId>jdi-light-vuetify-tests</artifactId>
<name>Tests: JDI Vuetify</name>
<version>1.4.10-SNAPSHOT</version>
<version>1.4.10</version>
<groupId>com.epam.jdi</groupId>

<properties>
Expand All @@ -17,7 +17,7 @@
<allure.maven>2.10.0</allure.maven>
<jetty.version>9.4.12.RC2</jetty.version>
<suite-xml-file>src/test/resources/general.xml</suite-xml-file>
<jdi.version>1.4.10-SNAPSHOT</jdi.version>
<jdi.version>1.4.10</jdi.version>
<log4j2.version>2.17.1</log4j2.version>
<!-- - - add-opens java.base/java.lang=ALL-UNNAMED is needed for JDK 16+ -->
<aspectj.args></aspectj.args>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public void activeClassSlideGroupTests() {
activeClassSlideGroup.has().slideNotSelected(1);
}

@Test(description="Test checks slide group feature 'center-active'")
@Test(enabled = false, description="Test checks slide group feature 'center-active'")
public void centerActiveSlideGroupTests() {
List<Integer> slidesPositions = new SlideGroupTestsData().centerActiveSlideGroupTestData();
centerActiveSlideGroup.show();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,11 +78,11 @@ public void denseTimeLineTest() {
denseTimeLine.is().dense();
TimeLineItem<IconAlert, UIElement> singleItem = denseTimeLine.item(1);
singleItem.body().icon().is().type("mdi-information");
singleItem.body().has().text(LOREM_IPSUM_TEXT);
singleItem.body().has().color(WHITE.value());
singleItem.body().has().backgroundColor(BLUE.value());
singleItem.has().dotColor(BLUE);
singleItem.has().smallDot();
singleItem.body().has().text(LOREM_IPSUM_TEXT)
.and().color(WHITE.value())
.and().backgroundColor(BLUE.value());
singleItem.has().dotColor(BLUE)
.and().smallDot();

denseLoggingButton.click();
waitCondition(() -> denseTimeLine.size() == 2);
Expand All @@ -98,10 +98,10 @@ public void iconDotsTimeLineTest(int index, String icon, String title, String te
TimeLineItem<ButtonCard, Icon> item = iconDotsTimeLine.item(index);
item.has().dotColor(color);
item.divider().has().type(icon);
item.body().title().has().text(title);
item.body().title().has().color(titleColor.value());
item.body().text().has().color(BLACK_TRANSPARENT_087.value());
item.body().text().has().text(text);
item.body().title().has().text(title)
.and().color(titleColor.value());
item.body().text().has().color(BLACK_TRANSPARENT_087.value())
.and().text(text);
}

@Test(description = "Test checks that timeline is reversed or not")
Expand Down Expand Up @@ -144,12 +144,12 @@ public void iconTimeLineTest() {
public void oppositeTimeLineTest(int index, String date, Colors color) {
TimeLineItem<DecadeEvent, UIElement> item = oppositeTimeLine.item(index);
item.has().dotColor(color);
item.opposite().has().text(date);
item.opposite().has().color(color.value());
item.body().title().has().color(color.value());
item.body().title().has().text(LOREM_IPSUM_TITLE);
item.body().content().has().color(BLACK_TRANSPARENT_087.value());
item.body().content().has().text(LOREM_IPSUM_TEXT);
item.opposite().has().text(date)
.and().color(color.value());
item.body().title().has().color(color.value())
.and().text(LOREM_IPSUM_TITLE);
item.body().content().has().color(BLACK_TRANSPARENT_087.value())
.and().text(LOREM_IPSUM_TEXT);
}

@Test(description = "Test checks that default timeline's items have expected data and properties")
Expand All @@ -165,8 +165,9 @@ public void defaultTimeLineTest() {
@Test(description = "Test checks that advanced timeline's items have expected data and properties")
public void advancedTimeLineTest() {
advancedTimeline.has().size(8);
advancedTimeline.defaultItem(1).has().largeDot();
advancedTimeline.defaultItem(1).has().dotColor(ORANGE);

advancedTimeline.defaultItem(1).has().largeDot()
.and().dotColor(ORANGE);
advancedTimeline.defaultItem(1).divider().has().text("JL");
advancedTimeline.defaultItem(1).body().find("input").has().hasLabel();
advancedTimeline.defaultItem(1).body().find("input").label().has().text("Leave a comment...");
Expand All @@ -175,8 +176,8 @@ public void advancedTimeLineTest() {
advancedTimeline.defaultItem(1).body().find("button").click();
advancedTimeline.has().size(9);

advancedTimeline.item(2).has().smallDot();
advancedTimeline.item(2).has().dotColor(PINK);
advancedTimeline.item(2).has().smallDot()
.and().dotColor(PINK);
advancedTimeline.item(2).body().message().has().text("Nice order dude!");

advancedTimeline.defaultItem(3).body().has().text("TODAY");
Expand Down
Loading

0 comments on commit fb1dfa7

Please sign in to comment.