diff --git a/jdi-bdd-tests/pom.xml b/jdi-bdd-tests/pom.xml index 222a048657..ddead3683b 100644 --- a/jdi-bdd-tests/pom.xml +++ b/jdi-bdd-tests/pom.xml @@ -6,11 +6,11 @@ com.epam.jdi jdi-bdd-tests - 1.5.3-SNAPSHOT + 1.5.4-SNAPSHOT Tests: JDI BDD - 1.5.3-SNAPSHOT + 1.5.4-SNAPSHOT UTF-8 chrome 9.4.12.RC2 @@ -44,12 +44,12 @@ io.cucumber cucumber-junit - 7.10.1 + 7.16.1 io.qameta.allure allure-cucumber7-jvm - 2.20.1 + 2.26.0 io.qameta.allure diff --git a/jdi-bdd/pom.xml b/jdi-bdd/pom.xml index f9553a48dc..887c70d74f 100644 --- a/jdi-bdd/pom.xml +++ b/jdi-bdd/pom.xml @@ -6,13 +6,13 @@ com.epam.jdi jdi-bdd - 1.5.3-SNAPSHOT + 1.5.4-SNAPSHOT JDI BDD https://github.com/jdi-testing JDI Light BDD library - 1.5.3-SNAPSHOT + 1.5.4-SNAPSHOT UTF-8 11 @@ -28,12 +28,12 @@ io.cucumber cucumber-java - 7.13.0 + 7.16.1 io.cucumber gherkin - 26.2.0 + 28.0.0 com.google.code.gson diff --git a/jdi-eyes-demo/pom.xml b/jdi-eyes-demo/pom.xml index b91a4e5853..b161004a07 100644 --- a/jdi-eyes-demo/pom.xml +++ b/jdi-eyes-demo/pom.xml @@ -6,12 +6,12 @@ com.epam.jdi jdi-eyes-demo - 1.5.3-SNAPSHOT + 1.5.4-SNAPSHOT jar Selenium to JDI Example with Eyes - 1.5.3-SNAPSHOT + 1.5.4-SNAPSHOT chrome https://jdi-testing.github.io/jdi-light/ UTF-8 diff --git a/jdi-light-angular-tests-with-mocks/pom.xml b/jdi-light-angular-tests-with-mocks/pom.xml index 87cb20c5eb..8cbdec38f1 100644 --- a/jdi-light-angular-tests-with-mocks/pom.xml +++ b/jdi-light-angular-tests-with-mocks/pom.xml @@ -6,11 +6,11 @@ com.epam.jdi jdi-light-angular-tests-with-mocks - 1.5.3-SNAPSHOT + 1.5.4-SNAPSHOT Tests: JDI Angular unit tests with mocks - 1.5.3-SNAPSHOT + 1.5.4-SNAPSHOT chrome 1.9.20 11 diff --git a/jdi-light-angular-tests/pom.xml b/jdi-light-angular-tests/pom.xml index 265ea8304d..28fad28ce8 100644 --- a/jdi-light-angular-tests/pom.xml +++ b/jdi-light-angular-tests/pom.xml @@ -6,11 +6,11 @@ com.epam.jdi jdi-light-angular-tests - 1.5.3-SNAPSHOT + 1.5.4-SNAPSHOT Tests: JDI Angular - 1.5.3-SNAPSHOT + 1.5.4-SNAPSHOT chrome 1.9.20 11 diff --git a/jdi-light-angular/pom.xml b/jdi-light-angular/pom.xml index 7a1c492e9c..18ec2be51c 100644 --- a/jdi-light-angular/pom.xml +++ b/jdi-light-angular/pom.xml @@ -6,14 +6,14 @@ com.epam.jdi jdi-light-angular - 1.5.3-SNAPSHOT + 1.5.4-SNAPSHOT jar JDI Light Angular https://github.com/jdi-testing JDI Light Angular library - 1.5.3-SNAPSHOT + 1.5.4-SNAPSHOT 1.9.20 1.14.0 11 diff --git a/jdi-light-applitools-tests/pom.xml b/jdi-light-applitools-tests/pom.xml index 877c65b62c..ba69d7ca08 100644 --- a/jdi-light-applitools-tests/pom.xml +++ b/jdi-light-applitools-tests/pom.xml @@ -6,12 +6,12 @@ com.epam.jdi jdi-light-applitools-tests - 1.5.3-SNAPSHOT + 1.5.4-SNAPSHOT jar Tests: JDI Light Applitools Eyes - 1.5.3-SNAPSHOT + 1.5.4-SNAPSHOT UTF-8 11 3.157.10 diff --git a/jdi-light-bootstrap-tests/pom.xml b/jdi-light-bootstrap-tests/pom.xml index 7f36d8462a..b69f059615 100644 --- a/jdi-light-bootstrap-tests/pom.xml +++ b/jdi-light-bootstrap-tests/pom.xml @@ -6,11 +6,11 @@ com.epam.jdi jdi-light-bootstrap-tests - 1.5.3-SNAPSHOT + 1.5.4-SNAPSHOT Tests: JDI Bootstrap - 1.5.3-SNAPSHOT + 1.5.4-SNAPSHOT chrome 2.12.0 diff --git a/jdi-light-bootstrap/pom.xml b/jdi-light-bootstrap/pom.xml index 1c1380e58f..3389a0c924 100644 --- a/jdi-light-bootstrap/pom.xml +++ b/jdi-light-bootstrap/pom.xml @@ -6,14 +6,14 @@ com.epam.jdi jdi-light-bootstrap - 1.5.3-SNAPSHOT + 1.5.4-SNAPSHOT jar JDI Light Bootstrap Elements https://github.com/jdi-testing JDI Light Bootstrap library - 1.5.3-SNAPSHOT + 1.5.4-SNAPSHOT 1.9.20 1.14.0 11 diff --git a/jdi-light-core/pom.xml b/jdi-light-core/pom.xml index adeee9ce3b..81c1aefdb2 100644 --- a/jdi-light-core/pom.xml +++ b/jdi-light-core/pom.xml @@ -6,7 +6,7 @@ com.epam.jdi jdi-light-core - 1.5.3-SNAPSHOT + 1.5.4-SNAPSHOT jar JDI Light Core https://github.com/jdi-testing @@ -17,7 +17,7 @@ 1.9.20 1.14.0 11 - 2.25.0 + 2.26.0 @@ -25,22 +25,22 @@ org.seleniumhq.selenium selenium-java - 4.18.1 + 4.19.1 com.fasterxml.jackson.core jackson-databind - 2.16.0 + 2.17.0 commons-io commons-io - 2.15.1 + 2.16.0 org.apache.commons commons-compress - 1.26.0 + 1.26.1 com.jdiai.tools @@ -66,7 +66,7 @@ io.github.bonigarcia webdrivermanager - 5.7.0 + 5.8.0 com.github.docker-java @@ -100,7 +100,7 @@ com.google.guava guava - 33.0.0-jre + 33.1.0-jre diff --git a/jdi-light-eyes/pom.xml b/jdi-light-eyes/pom.xml index 54ddd2465a..491713a519 100644 --- a/jdi-light-eyes/pom.xml +++ b/jdi-light-eyes/pom.xml @@ -6,14 +6,14 @@ com.epam.jdi jdi-light-eyes - 1.5.3-SNAPSHOT + 1.5.4-SNAPSHOT jar JDI Light Applitools Eyes https://github.com/jdi-testing JDI Light Eyes library - 1.5.3-SNAPSHOT + 1.5.4-SNAPSHOT 11 3.210.6 diff --git a/jdi-light-html-tests/pom.xml b/jdi-light-html-tests/pom.xml index 1242159dbf..f2700252c6 100644 --- a/jdi-light-html-tests/pom.xml +++ b/jdi-light-html-tests/pom.xml @@ -6,11 +6,11 @@ com.epam.jdi jdi-light-html-tests - 1.5.3-SNAPSHOT + 1.5.4-SNAPSHOT Tests: JDI Html - 1.5.3-SNAPSHOT + 1.5.4-SNAPSHOT UTF-8 chrome false diff --git a/jdi-light-html/pom.xml b/jdi-light-html/pom.xml index 63565bf928..8cfebd255d 100644 --- a/jdi-light-html/pom.xml +++ b/jdi-light-html/pom.xml @@ -6,14 +6,14 @@ com.epam.jdi jdi-light-html - 1.5.3-SNAPSHOT + 1.5.4-SNAPSHOT jar JDI Light Html Elements https://github.com/jdi-testing JDI Light HTML5 library - 1.5.3-SNAPSHOT + 1.5.4-SNAPSHOT 1.9.20 1.14.0 11 diff --git a/jdi-light-material-ui-tests/pom.xml b/jdi-light-material-ui-tests/pom.xml index 03d408bdcb..e3d448ad22 100644 --- a/jdi-light-material-ui-tests/pom.xml +++ b/jdi-light-material-ui-tests/pom.xml @@ -6,7 +6,7 @@ jdi-light-material-ui-tests Tests: JDI Material UI - 1.5.3-SNAPSHOT + 1.5.4-SNAPSHOT com.epam.jdi @@ -16,7 +16,7 @@ 2.25.0 2.12.0 9.4.12.RC2 - 1.5.3-SNAPSHOT + 1.5.4-SNAPSHOT src/test/resources/general.xml 7.8.0 diff --git a/jdi-light-material-ui-tests/src/main/java/io/github/com/StaticSite.java b/jdi-light-material-ui-tests/src/main/java/io/github/com/StaticSite.java index 271f422c5b..ac8c8bb72a 100644 --- a/jdi-light-material-ui-tests/src/main/java/io/github/com/StaticSite.java +++ b/jdi-light-material-ui-tests/src/main/java/io/github/com/StaticSite.java @@ -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/") @@ -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; diff --git a/jdi-light-material-ui-tests/src/main/java/io/github/com/pages/utils/TransitionPage.java b/jdi-light-material-ui-tests/src/main/java/io/github/com/pages/utils/TransitionPage.java deleted file mode 100644 index a583961b8f..0000000000 --- a/jdi-light-material-ui-tests/src/main/java/io/github/com/pages/utils/TransitionPage.java +++ /dev/null @@ -1,30 +0,0 @@ -package io.github.com.pages.utils; - -import com.epam.jdi.light.elements.composite.WebPage; -import com.epam.jdi.light.elements.pageobjects.annotations.locators.UI; -import com.epam.jdi.light.material.elements.inputs.Switch; -import com.epam.jdi.light.material.elements.utils.Transition; - -import java.util.List; - -public class TransitionPage extends WebPage { - - // @todo #5297 Check the locators - @UI("//h2[text()='Collapse']/following::div[contains(@class,'MuiCollapse-root')]") - public static List collapseTransitions; - - @UI("//h2[text()='Fade']/following::div[contains(@class,'MuiPaper-root')]") - public static List fadeTransitions; - - @UI("//h2[text() = 'Grow']//following::div[contains(@class,'MuiPaper-root')]") - public static List growTransitions; - - @UI("//h2[text() = 'Slide']//following::div[contains(@class,'MuiPaper-root')]") - public static List slideTransitions; - - @UI("//h2[text()='Zoom']/following::div[contains(@class,'MuiPaper-root')]") - public static List zoomTransitions; - - @UI("span.MuiSwitch-root") - public static List switches; -} diff --git a/jdi-light-material-ui-tests/src/test/java/io/github/epam/material/tests/utils/TransitionTests.java b/jdi-light-material-ui-tests/src/test/java/io/github/epam/material/tests/utils/TransitionTests.java deleted file mode 100644 index eccefa5f63..0000000000 --- a/jdi-light-material-ui-tests/src/test/java/io/github/epam/material/tests/utils/TransitionTests.java +++ /dev/null @@ -1,46 +0,0 @@ -package io.github.epam.material.tests.utils; - -import com.epam.jdi.light.material.elements.inputs.Switch; -import com.epam.jdi.light.material.elements.utils.Transition; -import io.github.epam.TestsInit; -import io.github.epam.test.data.TransitionDataProvider; -import org.testng.annotations.BeforeMethod; -import org.testng.annotations.Test; - -import static com.jdiai.tools.Timer.waitCondition; -import static io.github.com.StaticSite.transitionPage; -import static io.github.com.pages.utils.TransitionPage.collapseTransitions; -import static io.github.com.pages.utils.TransitionPage.switches; - -public class TransitionTests extends TestsInit { - - @BeforeMethod - public void before() { - transitionPage.open(); - transitionPage.shouldBeOpened(); - } - - @Test(dataProvider = "transitionTestData", dataProviderClass = TransitionDataProvider.class) - public void basicFunctionalityTest(Transition transition, int switchIndex) { - Switch transitionSwitch = switches.get(switchIndex); - transition.show(); - - transitionSwitch.is().unchecked(); - transition.is().exited(); - transitionSwitch.check(); - waitCondition(transitionSwitch::isChecked); - transition.is().entered(); - transitionSwitch.uncheck(); - transition.is().exited(); - } - - @Test - public void collapseHiddenTest() { - switches.get(1).check(); - collapseTransitions.get(1).is().displayed(); - collapseTransitions.get(2).is().displayed(); - switches.get(1).uncheck(); - collapseTransitions.get(1).is().hidden(); - collapseTransitions.get(2).is().displayed(); - } -} diff --git a/jdi-light-material-ui-tests/src/test/java/io/github/epam/test/data/TransitionDataProvider.java b/jdi-light-material-ui-tests/src/test/java/io/github/epam/test/data/TransitionDataProvider.java deleted file mode 100644 index 50ca50f30d..0000000000 --- a/jdi-light-material-ui-tests/src/test/java/io/github/epam/test/data/TransitionDataProvider.java +++ /dev/null @@ -1,27 +0,0 @@ -package io.github.epam.test.data; - -import org.testng.annotations.DataProvider; - -import static io.github.com.pages.utils.TransitionPage.collapseTransitions; -import static io.github.com.pages.utils.TransitionPage.fadeTransitions; -import static io.github.com.pages.utils.TransitionPage.growTransitions; -import static io.github.com.pages.utils.TransitionPage.slideTransitions; -import static io.github.com.pages.utils.TransitionPage.zoomTransitions; - -public class TransitionDataProvider { - - @DataProvider - public Object[][] transitionTestData() { - return new Object[][] { - {collapseTransitions.get(1), 1}, - {collapseTransitions.get(2), 1}, - {fadeTransitions.get(1), 2}, - {fadeTransitions.get(2), 2}, - {growTransitions.get(1), 3}, - {growTransitions.get(2), 3}, - {slideTransitions.get(1), 4}, - {zoomTransitions.get(1), 5}, - {zoomTransitions.get(2), 5}, - }; - } -} diff --git a/jdi-light-material-ui/pom.xml b/jdi-light-material-ui/pom.xml index 6a31928bf5..d1a79d1df8 100644 --- a/jdi-light-material-ui/pom.xml +++ b/jdi-light-material-ui/pom.xml @@ -7,7 +7,7 @@ jdi-light-material-ui jar JDI Light Material UI Elements v4 - 1.5.3-SNAPSHOT + 1.5.4-SNAPSHOT com.epam.jdi https://github.com/jdi-testing JDI Light Material UI Elements library for version 4 @@ -16,7 +16,7 @@ 1.9.20 1.14.0 11 - 1.5.3-SNAPSHOT + 1.5.4-SNAPSHOT diff --git a/jdi-light-material-ui/src/main/java/com/epam/jdi/light/material/asserts/utils/TransitionAssert.java b/jdi-light-material-ui/src/main/java/com/epam/jdi/light/material/asserts/utils/TransitionAssert.java deleted file mode 100644 index a0672132b8..0000000000 --- a/jdi-light-material-ui/src/main/java/com/epam/jdi/light/material/asserts/utils/TransitionAssert.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.epam.jdi.light.material.asserts.utils; - -import com.epam.jdi.light.asserts.generic.UIAssert; -import com.epam.jdi.light.common.JDIAction; -import com.epam.jdi.light.material.elements.utils.Transition; -import org.hamcrest.Matchers; - -import static com.epam.jdi.light.asserts.core.SoftAssert.jdiAssert; - -/** - * Assertions for {@link Transition} - */ -public class TransitionAssert extends UIAssert { - - /** - * Checks that transition is entered. - * - * @return this {@link TransitionAssert} instance - */ - @JDIAction(value = "Assert that '{name}' is entered", isAssert = true) - public TransitionAssert entered() { - jdiAssert(element().isEntered(), Matchers.is(true), - "Transition is not entered"); - return this; - } - - /** - * Checks that transition is exited. - * - * @return this {@link TransitionAssert} instance - */ - @JDIAction(value = "Assert that '{name}' is exited", isAssert = true) - public TransitionAssert exited() { - jdiAssert(element().isExited(), Matchers.is(true), - "Transition is not exited"); - return this; - } - - @Override - @JDIAction(value = "Assert that '{name}' is hidden", isAssert = true) - public TransitionAssert hidden() { - jdiAssert(element().isHidden(), Matchers.is(true), - "Transition is visible"); - return this; - } - - @Override - @JDIAction(value = "Assert that '{name}' is displayed", isAssert = true) - public TransitionAssert displayed() { - jdiAssert(element().isDisplayed(), Matchers.is(true), - "Transition is hidden"); - return this; - } -} diff --git a/jdi-light-material-ui/src/main/java/com/epam/jdi/light/material/elements/utils/Transition.java b/jdi-light-material-ui/src/main/java/com/epam/jdi/light/material/elements/utils/Transition.java deleted file mode 100644 index 06c4db3dcd..0000000000 --- a/jdi-light-material-ui/src/main/java/com/epam/jdi/light/material/elements/utils/Transition.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.epam.jdi.light.material.elements.utils; - -import com.epam.jdi.light.common.JDIAction; -import com.epam.jdi.light.elements.base.UIBaseElement; -import com.epam.jdi.light.material.asserts.utils.TransitionAssert; - -/** - * Represent transition MUI component on GUI. Transitions can be used to introduce some basic motion to applications. - * There are different types of transitions. Transition 'Collapse' is different from other transitions because there is - * a separate class "MuiCollapse" for it. - * - * @see Transition MUI documentation - * @see MUI test page - */ -public class Transition extends UIBaseElement { - - /** - * Checks if the transition is entered or not. - * - * @return {@code true} if the transition is entered, otherwise {@code false} - */ - @JDIAction("Check that '{name}' is entered") - public boolean isEntered() { - return core().isDisplayed() || core().hasClass("MuiCollapse-entered"); - } - - /** - * Checks if the transition is exited or not. - * - * @return {@code true} if the transition is exited, otherwise {@code false} - */ - @JDIAction("Check that '{name}' is exited") - public boolean isExited() { - return core().isHidden() || !core().hasClass("MuiCollapse-entered"); - } - - @Override - @JDIAction("Check that '{name}' is hidden") - public boolean isHidden() { - return core().isHidden() || core().hasClass("MuiCollapse-hidden"); - } - - @Override - @JDIAction("Check that '{name}' is displayed") - public boolean isDisplayed() { - return !isHidden(); - } - - @Override - public TransitionAssert is() { - return new TransitionAssert().set(this); - } -} diff --git a/jdi-light-mobile-tests/pom.xml b/jdi-light-mobile-tests/pom.xml index a1235ff690..b12801f86d 100644 --- a/jdi-light-mobile-tests/pom.xml +++ b/jdi-light-mobile-tests/pom.xml @@ -6,11 +6,11 @@ com.epam.jdi jdi-light-mobile-tests - 1.5.3-SNAPSHOT + 1.5.4-SNAPSHOT Tests: JDI Mobile - 1.5.3-SNAPSHOT + 1.5.4-SNAPSHOT UTF-8 chrome diff --git a/jdi-light-mobile/pom.xml b/jdi-light-mobile/pom.xml index 854aa8f114..33c1c1a244 100644 --- a/jdi-light-mobile/pom.xml +++ b/jdi-light-mobile/pom.xml @@ -6,14 +6,14 @@ com.epam.jdi jdi-light-mobile - 1.5.3-SNAPSHOT + 1.5.4-SNAPSHOT jar JDI Light Mobile https://github.com/jdi-testing JDI Light Mobile library - 1.5.3-SNAPSHOT + 1.5.4-SNAPSHOT 1.9.20 1.14.0 11 diff --git a/jdi-light-mobile/src/main/java/com/epam/jdi/light/mobile/elements/common/app/android/RatingBar.java b/jdi-light-mobile/src/main/java/com/epam/jdi/light/mobile/elements/common/app/android/RatingBar.java index 58461bab6e..a872ebfb08 100644 --- a/jdi-light-mobile/src/main/java/com/epam/jdi/light/mobile/elements/common/app/android/RatingBar.java +++ b/jdi-light-mobile/src/main/java/com/epam/jdi/light/mobile/elements/common/app/android/RatingBar.java @@ -17,7 +17,6 @@ public double getRating() { return Double.parseDouble(core().getText()); } - // @todo #1 Check if 1.0 is really the minimum, as typically 0 is minimum @JDIAction("Setup rating value to {0} with the max value as {1} (Value should not greater then max and not less then 1.0)") public void setRatingByClick(double value, double fullStars) { if (value > fullStars || value < 1.0) { @@ -37,7 +36,6 @@ public void setRating(double value) { core().setValue(String.valueOf(value)); } - public RatingBarAssert is() { return new RatingBarAssert().set(this); } diff --git a/jdi-light-vuetify-tests/pom.xml b/jdi-light-vuetify-tests/pom.xml index c525ba5ff5..fd9bfe53be 100644 --- a/jdi-light-vuetify-tests/pom.xml +++ b/jdi-light-vuetify-tests/pom.xml @@ -6,7 +6,7 @@ jdi-light-vuetify-tests Tests: JDI Vuetify - 1.5.3-SNAPSHOT + 1.5.4-SNAPSHOT com.epam.jdi @@ -17,7 +17,7 @@ 2.12.0 9.4.12.RC2 src/test/resources/general.xml - 1.5.3-SNAPSHOT + 1.5.4-SNAPSHOT 7.8.0 diff --git a/jdi-light-vuetify-tests/src/main/java/io/github/com/StaticSite.java b/jdi-light-vuetify-tests/src/main/java/io/github/com/StaticSite.java index 71bf55b2d4..e7c241aa43 100644 --- a/jdi-light-vuetify-tests/src/main/java/io/github/com/StaticSite.java +++ b/jdi-light-vuetify-tests/src/main/java/io/github/com/StaticSite.java @@ -4,7 +4,6 @@ import com.epam.jdi.light.elements.pageobjects.annotations.Url; import io.github.com.pages.AlertsPage; import io.github.com.pages.AppBarsPage; -import io.github.com.pages.ApplicationPage; import io.github.com.pages.AspectRatiosPage; import io.github.com.pages.AutocompletesPage; import io.github.com.pages.AvatarsPage; @@ -85,9 +84,6 @@ public class StaticSite { @Url("/app-bars") public static AppBarsPage appBarsPage; - @Url("/application") - public static ApplicationPage applicationPage; - @Url("/aspect-ratios") public static AspectRatiosPage aspectRatiosPage; diff --git a/jdi-light-vuetify-tests/src/main/java/io/github/com/pages/ApplicationPage.java b/jdi-light-vuetify-tests/src/main/java/io/github/com/pages/ApplicationPage.java deleted file mode 100644 index 9bda6b51a7..0000000000 --- a/jdi-light-vuetify-tests/src/main/java/io/github/com/pages/ApplicationPage.java +++ /dev/null @@ -1,5 +0,0 @@ -package io.github.com.pages; - -public class ApplicationPage extends VuetifyPage { - // @todo #5291 Fill in the page or delete it -} diff --git a/jdi-light-vuetify-tests/src/main/java/io/github/com/pages/BannersPage.java b/jdi-light-vuetify-tests/src/main/java/io/github/com/pages/BannersPage.java index 4e0205fcc4..336201b306 100644 --- a/jdi-light-vuetify-tests/src/main/java/io/github/com/pages/BannersPage.java +++ b/jdi-light-vuetify-tests/src/main/java/io/github/com/pages/BannersPage.java @@ -10,8 +10,7 @@ public class BannersPage extends VuetifyPage { @UI("#SingleBanner .v-banner") public static Banner singleBanner; - // @todo #5298 Locator is to input, not for the switch - @UI("#SingleBanner .v-input--selection-controls__input") + @UI("#SingleBanner .v-input--switch") public static Switch singleBannerSwitch; @UI("#EventsBanner") diff --git a/jdi-light-vuetify-tests/src/main/java/io/github/com/pages/DataIteratorsPage.java b/jdi-light-vuetify-tests/src/main/java/io/github/com/pages/DataIteratorsPage.java index 3a143dd726..4b57877001 100644 --- a/jdi-light-vuetify-tests/src/main/java/io/github/com/pages/DataIteratorsPage.java +++ b/jdi-light-vuetify-tests/src/main/java/io/github/com/pages/DataIteratorsPage.java @@ -18,7 +18,7 @@ public class DataIteratorsPage extends VuetifyPage { @UI("#HeaderFooterTable .v-data-iterator") public static DataIterator headerFooterDataIterator; - @UI("#DefaultTable .v-input--selection-controls") + @UI("#DefaultTable .v-input--switch") public static Switch defaultDataIteratorSingleSelect; @UI("#FilterTable .v-data-iterator") diff --git a/jdi-light-vuetify-tests/src/main/java/io/github/com/pages/DataTablesPage.java b/jdi-light-vuetify-tests/src/main/java/io/github/com/pages/DataTablesPage.java index 97ed3e2b33..ae7d59fd34 100644 --- a/jdi-light-vuetify-tests/src/main/java/io/github/com/pages/DataTablesPage.java +++ b/jdi-light-vuetify-tests/src/main/java/io/github/com/pages/DataTablesPage.java @@ -58,7 +58,7 @@ public class DataTablesPage extends VuetifyPage { @UI("#RowSelectionTable") public static RowSelectionDataTable rowSelectionTable; - @UI("#RowSelectionTable .v-input--selection-controls") + @UI("#RowSelectionTable .v-input--switch") public static Switch rowSelectionTableSingleSelect; @UI("#SearchTable .v-data-table") @@ -103,7 +103,7 @@ public class DataTablesPage extends VuetifyPage { @UI("#ExpandableRowsTable") public static DataTable expandableRowsTable; - @UI("#ExpandableRowsTable .v-input--selection-controls") + @UI("#ExpandableRowsTable .v-input--switch") public static Switch expandableRowsTableSingleExpand; @UI("#ExternalPaginationTable") diff --git a/jdi-light-vuetify-tests/src/main/java/io/github/com/pages/SheetsPage.java b/jdi-light-vuetify-tests/src/main/java/io/github/com/pages/SheetsPage.java index 562c81016e..7c31c72f77 100644 --- a/jdi-light-vuetify-tests/src/main/java/io/github/com/pages/SheetsPage.java +++ b/jdi-light-vuetify-tests/src/main/java/io/github/com/pages/SheetsPage.java @@ -7,8 +7,7 @@ public class SheetsPage extends VuetifyPage { - // @todo #5298 Looks like locator point not to sheet, but on content. SHould be refactored - @UI("#ElevationSheet .v-sheet div") + @UI("#ElevationSheet .v-sheet .v-sheet") public static List elevationSheets; @UI("(//*[@id = 'RoundedSheet']//*[contains(@class, 'mx-auto')])[1]") diff --git a/jdi-light-vuetify-tests/src/main/java/io/github/com/pages/SnackbarsPage.java b/jdi-light-vuetify-tests/src/main/java/io/github/com/pages/SnackbarsPage.java index 22213d29f2..3bad71c431 100644 --- a/jdi-light-vuetify-tests/src/main/java/io/github/com/pages/SnackbarsPage.java +++ b/jdi-light-vuetify-tests/src/main/java/io/github/com/pages/SnackbarsPage.java @@ -9,31 +9,30 @@ public class SnackbarsPage extends VuetifyPage { - // @todo #5298 Locators are not stable enough - @UI("//div[@class='container'][1]//button") + @UI("//div[./h2/text()='Simple Snackbar']//button") public static Button simpleSnackbarOpen; - @UI("//div[@class='container'][1]/div/div") + @UI("//div[./h2/text()='Simple Snackbar']//div[contains(@class, 'v-snack')]") public static ClosingSnackbar simpleSnackbar; - @UI("//div[@class='container'][2]//button") + @UI("//div[./h2/text()='Multi line Snackbar']//button") public static Button multilineSnackbarOpen; - @UI("//div[@class='container'][2]/div/div") + @UI("//div[./h2/text()='Multi line Snackbar']//div[contains(@class, 'v-snack')]") public static ClosingSnackbar multilineSnackbar; - @UI("//div[@class='container'][3]//button") + @UI("//div[./h2/text()='Timeout Snackbar']//button") public static Button timeoutSnackbarOpen; - @UI("//div[@class='container'][3]/div/div") + @UI("//div[./h2/text()='Timeout Snackbar']//div[contains(@class, 'v-snack')]") public static ClosingSnackbar timeoutSnackbar; @UI(".v-card--flat .v-snack--absolute") public static List diffStylesSnackbars; - @UI("//div[@class='container'][5]//button") + @UI("//div[./h2/text()='Vertical Snackbar']//button") public static Button verticalSnackbarOpen; - @UI("//div[@class='container'][5]/div/div") + @UI("//div[./h2/text()='Vertical Snackbar']//div[contains(@class, 'v-snack')]") public static ClosingSnackbar verticalSnackbar; } diff --git a/jdi-light-vuetify-tests/src/main/java/io/github/com/pages/SparklinesPage.java b/jdi-light-vuetify-tests/src/main/java/io/github/com/pages/SparklinesPage.java index 1364ab83a0..dc81888443 100644 --- a/jdi-light-vuetify-tests/src/main/java/io/github/com/pages/SparklinesPage.java +++ b/jdi-light-vuetify-tests/src/main/java/io/github/com/pages/SparklinesPage.java @@ -23,7 +23,7 @@ public class SparklinesPage extends VuetifyPage { @UI("#FillSparkline .v-input__slider[3]") public static Slider fillSparklinePaddingSlider; - @UI("#FillSparkline .v-input--selection-controls__input") + @UI("#FillSparkline .v-input--switch") public static Switch fillSparklineFilledSwitch; @UI("#CustomLabelsSparkline svg") diff --git a/jdi-light-vuetify/pom.xml b/jdi-light-vuetify/pom.xml index ff35a97033..bfe0624225 100644 --- a/jdi-light-vuetify/pom.xml +++ b/jdi-light-vuetify/pom.xml @@ -7,7 +7,7 @@ jdi-light-vuetify jar JDI Light Vuetify v2 - 1.5.3-SNAPSHOT + 1.5.4-SNAPSHOT com.epam.jdi https://github.com/jdi-testing JDI Light Vuetify UI Elements library for version 2 @@ -16,7 +16,7 @@ 1.9.20 1.14.0 11 - 1.5.3-SNAPSHOT + 1.5.4-SNAPSHOT diff --git a/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/elements/common/Snackbar.java b/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/elements/common/Snackbar.java index 6e2c26476c..1592687ef2 100644 --- a/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/elements/common/Snackbar.java +++ b/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/elements/common/Snackbar.java @@ -58,7 +58,7 @@ public boolean isBottom() { return core().attr("class").contains("--bottom"); } - @JDIAction("Get if {name} is multilineed") + @JDIAction("Get if {name} is multilined") public boolean isMultiLine() { return core().attr("class").contains("--multi-line"); } diff --git a/jdi-light/pom.xml b/jdi-light/pom.xml index af01d9d844..9c3bcd643b 100644 --- a/jdi-light/pom.xml +++ b/jdi-light/pom.xml @@ -6,7 +6,7 @@ com.epam.jdi jdi-light - 1.5.3-SNAPSHOT + 1.5.4-SNAPSHOT jar JDI Light https://github.com/jdi-testing @@ -14,7 +14,7 @@ 11 - 1.5.3-SNAPSHOT + 1.5.4-SNAPSHOT 2.22.0 diff --git a/pom.xml b/pom.xml index 5241146f2e..2b3c30bf46 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.epam.jdi jdi-2 - 1.5.3-SNAPSHOT + 1.5.4-SNAPSHOT pom JDI UI 2.0 diff --git a/test-examples/jdi-bdd-no-po-tests/pom.xml b/test-examples/jdi-bdd-no-po-tests/pom.xml index 5c98eb9f36..723b265ab7 100644 --- a/test-examples/jdi-bdd-no-po-tests/pom.xml +++ b/test-examples/jdi-bdd-no-po-tests/pom.xml @@ -6,11 +6,11 @@ com.epam.jdi jdi-bdd-no-po-tests - 1.5.3-SNAPSHOT + 1.5.4-SNAPSHOT Examples: JDI BDD no Page Objects - 1.5.3-SNAPSHOT + 1.5.4-SNAPSHOT chrome UTF-8 9.4.12.RC2 @@ -43,7 +43,7 @@ io.cucumber cucumber-junit - 7.10.1 + 7.16.1 io.qameta.allure diff --git a/test-examples/jdi-light-examples/pom.xml b/test-examples/jdi-light-examples/pom.xml index 20e44e80e8..710c8d2149 100644 --- a/test-examples/jdi-light-examples/pom.xml +++ b/test-examples/jdi-light-examples/pom.xml @@ -6,11 +6,11 @@ com.epam.jdi jdi-light-examples - 1.5.3-SNAPSHOT + 1.5.4-SNAPSHOT Examples: JDI Web Tests - 1.5.3-SNAPSHOT + 1.5.4-SNAPSHOT chrome 2.25.0 2.12.0 diff --git a/test-examples/jdi-performance/pom.xml b/test-examples/jdi-performance/pom.xml index cf969668ae..5997bd68a6 100644 --- a/test-examples/jdi-performance/pom.xml +++ b/test-examples/jdi-performance/pom.xml @@ -6,11 +6,11 @@ com.epam.jdi jdi-performance - 1.5.3-SNAPSHOT + 1.5.4-SNAPSHOT Examples: JDI Performance - 1.5.3-SNAPSHOT + 1.5.4-SNAPSHOT UTF-8 chrome diff --git a/test-templates/jdi-light-junit-template/pom.xml b/test-templates/jdi-light-junit-template/pom.xml index ef5eb4fee0..66490e5f59 100644 --- a/test-templates/jdi-light-junit-template/pom.xml +++ b/test-templates/jdi-light-junit-template/pom.xml @@ -10,11 +10,11 @@ Template: JDI Light JUnit - 1.5.3-SNAPSHOT + 1.5.4-SNAPSHOT UTF-8 chrome https://jdi-testing.github.io/jdi-light/ - 2.19.0 + 2.26.0 2.12.0 2.19.1 1.9.20 diff --git a/test-templates/jdi-light-testng-template/pom.xml b/test-templates/jdi-light-testng-template/pom.xml index 45035ce158..6d62074b59 100644 --- a/test-templates/jdi-light-testng-template/pom.xml +++ b/test-templates/jdi-light-testng-template/pom.xml @@ -10,7 +10,7 @@ Template: JDI Light TestNG - 1.5.3-SNAPSHOT + 1.5.4-SNAPSHOT chrome UTF-8