diff --git a/jdi-light-angular-tests/src/main/java/io/github/com/StaticSite.java b/jdi-light-angular-tests/src/main/java/io/github/com/StaticSite.java index 0c329d4132..4570001050 100644 --- a/jdi-light-angular-tests/src/main/java/io/github/com/StaticSite.java +++ b/jdi-light-angular-tests/src/main/java/io/github/com/StaticSite.java @@ -14,6 +14,7 @@ import io.github.com.pages.ProgressSpinnerPage; import io.github.com.pages.RadioButtonPage; import io.github.com.pages.SlideTogglePage; +import io.github.com.pages.GridListPage; @JSite("https://jdi-testing.github.io/jdi-light/angular-page/#/") public class StaticSite { @@ -36,6 +37,9 @@ public class StaticSite { @Url("badges") public static BadgePage badgePage; + @Url("grid_list") + public static GridListPage gridListPage; + @Url("buttons_toggle") public static ButtonTogglePage buttonTogglePage; diff --git a/jdi-light-angular-tests/src/main/java/io/github/com/custom/elements/CustomGridTileWithImage.java b/jdi-light-angular-tests/src/main/java/io/github/com/custom/elements/CustomGridTileWithImage.java new file mode 100644 index 0000000000..1b25b923e9 --- /dev/null +++ b/jdi-light-angular-tests/src/main/java/io/github/com/custom/elements/CustomGridTileWithImage.java @@ -0,0 +1,11 @@ +package io.github.com.custom.elements; + +import com.epam.jdi.light.angular.elements.complex.gridlist.GridTile; +import com.epam.jdi.light.elements.common.UIElement; +import com.epam.jdi.light.elements.pageobjects.annotations.locators.UI; + +public class CustomGridTileWithImage extends GridTile { + + @UI("#dynamic-grid-item-avatar") + public UIElement image; +} diff --git a/jdi-light-angular-tests/src/main/java/io/github/com/enums/Colors.java b/jdi-light-angular-tests/src/main/java/io/github/com/enums/Colors.java index da73b3dbc9..5efb9eb966 100644 --- a/jdi-light-angular-tests/src/main/java/io/github/com/enums/Colors.java +++ b/jdi-light-angular-tests/src/main/java/io/github/com/enums/Colors.java @@ -17,6 +17,7 @@ public enum Colors { RED_ACCENT_3("rgba(255, 23, 68, 1)"), RED_ACCENT_4("rgba(213, 0, 0, 1)"), PINK("rgba(233, 30, 99, 1)"), + LIGHT_PINK("rgba(255, 182, 193, 1)"), PINK_LIGHTEN_5("rgba(252, 228, 236, 1)"), PINK_LIGHTEN_4("rgba(248, 187, 208, 1)"), PINK_LIGHTEN_3("rgba(244, 143, 177, 1)"), @@ -90,6 +91,7 @@ public enum Colors { BLUE_ACCENT_5("rgba(138, 197, 255, 1)"), BLUE_ACCENT_6("rgb(25, 118, 210)"), LIGHT_BLUE("rgba(3, 169, 244, 1)"), + LIGHT_BLUE_2("rgba(173, 216, 230, 1)"), LIGHT_BLUE_LIGHTEN_5("rgba(225, 245, 254, 1)"), LIGHT_BLUE_LIGHTEN_4("rgba(179, 229, 252, 1)"), LIGHT_BLUE_LIGHTEN_3("rgba(129, 212, 250, 1)"), @@ -148,6 +150,7 @@ public enum Colors { GREEN_ACCENT_4("rgba(0, 200, 83, 1)"), GREEN_ACCENT_5("rgb(76, 175, 80)"), LIGHT_GREEN("rgba(139, 195, 74, 1)"), + LIGHT_GREEN_2("rgba(144, 238, 144, 1)"), LIGHT_GREEN_LIGHTEN_5("rgba(241, 248, 233, 1)"), LIGHT_GREEN_LIGHTEN_4("rgba(220, 237, 200, 1)"), LIGHT_GREEN_LIGHTEN_3("rgba(197, 225, 165, 1)"), @@ -274,6 +277,7 @@ public enum Colors { WHITE_TRANSPARENT_087("rgba(255, 255, 255, 0.87)"), WHITE_TRANSPARENT_038("rgba(0, 0, 0, 0.38)"), RED_TRANSPARENT_055("rgba(244, 67, 54, 0.55)"), + LIGHT_LILAC("rgba(221, 189, 241, 1)"), TRANSPARENT("rgba(0, 0, 0, 0)"); private final String rgba; diff --git a/jdi-light-angular-tests/src/main/java/io/github/com/pages/AngularPage.java b/jdi-light-angular-tests/src/main/java/io/github/com/pages/AngularPage.java index 776bc1c465..2c2ff08ccb 100644 --- a/jdi-light-angular-tests/src/main/java/io/github/com/pages/AngularPage.java +++ b/jdi-light-angular-tests/src/main/java/io/github/com/pages/AngularPage.java @@ -5,7 +5,6 @@ import com.epam.jdi.light.elements.composite.WebPage; import com.epam.jdi.light.elements.pageobjects.annotations.locators.UI; import com.epam.jdi.light.ui.html.elements.common.Icon; -import io.github.com.pages.sections.GridListSection; import io.github.com.pages.sections.ListSection; import io.github.com.pages.sections.SnackbarSection; import io.github.com.pages.sections.TabGroupSection; @@ -21,7 +20,6 @@ public class AngularPage extends WebPage { public static BottomSheet bottomSheet; public static Dialog dialog; public static ListSection listSection; - public static GridListSection gridListSection; public static SnackbarSection snackbarSection; public static TabGroupSection tabsSection; public static TableSection tableSection; diff --git a/jdi-light-angular-tests/src/main/java/io/github/com/pages/GridListPage.java b/jdi-light-angular-tests/src/main/java/io/github/com/pages/GridListPage.java new file mode 100644 index 0000000000..dfd0fa3c03 --- /dev/null +++ b/jdi-light-angular-tests/src/main/java/io/github/com/pages/GridListPage.java @@ -0,0 +1,14 @@ +package io.github.com.pages; + +import com.epam.jdi.light.angular.elements.complex.gridlist.GridList; +import com.epam.jdi.light.elements.pageobjects.annotations.locators.UI; +import io.github.com.custom.elements.CustomGridTileWithImage; + +public class GridListPage extends NewAngularPage { + + @UI("#dynamic-grid-list") + public static GridList dynamicGridList; + + @UI("#dynamic-grid-list-two") + public static CustomGridTileWithImage tileWithImage; +} diff --git a/jdi-light-angular-tests/src/main/java/io/github/com/pages/sections/GridListSection.java b/jdi-light-angular-tests/src/main/java/io/github/com/pages/sections/GridListSection.java deleted file mode 100644 index 8b74c5c2c2..0000000000 --- a/jdi-light-angular-tests/src/main/java/io/github/com/pages/sections/GridListSection.java +++ /dev/null @@ -1,14 +0,0 @@ -package io.github.com.pages.sections; - -import com.epam.jdi.light.elements.common.Label; -import com.epam.jdi.light.elements.complex.JList; -import com.epam.jdi.light.elements.composite.Section; -import com.epam.jdi.light.elements.pageobjects.annotations.locators.UI; - -public class GridListSection extends Section { - @UI("#basic-grid-list mat-grid-tile") - public JList