From 54ddcaa8107e236246e9ce78978de2489a732adf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A1=D0=B2=D0=B5=D1=82=D0=BB=D0=B0=D0=BA=D0=BE=D0=B2=20?= =?UTF-8?q?=D0=90=D0=BD=D1=82=D0=BE=D0=BD=20=D0=92=D1=8F=D1=87=D0=B5=D1=81?= =?UTF-8?q?=D0=BB=D0=B0=D0=B2=D0=BE=D0=B2=D0=B8=D1=87=20=284046822=29?= Date: Thu, 2 Dec 2021 19:00:33 +0700 Subject: [PATCH] Added supporting Selenium 4 --- README.md | 7 ++++--- htmlelements-all/pom.xml | 2 +- htmlelements-java/pom.xml | 4 ++-- .../yandex/qatools/htmlelements/element/HtmlElement.java | 2 +- .../qatools/htmlelements/element/TypifiedElement.java | 2 +- .../htmlelements/loader/decorator/ProxyFactory.java | 2 +- htmlelements-matchers/pom.xml | 2 +- .../htmlelements/matchers/WrapsElementMatchers.java | 2 +- .../htmlelements/matchers/common/WrapsElementMatcher.java | 2 +- htmlelements-thucydides/pom.xml | 2 +- pom.xml | 2 +- 11 files changed, 15 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index 6ade89c4..19436a83 100644 --- a/README.md +++ b/README.md @@ -23,6 +23,7 @@ In case you are not a Java guy/gal, don't panic, there are still few options: Release Notes ------------- +* [Version 1.20 Release Notes](https://github.com/yandex-qatools/htmlelements/releases/tag/htmlelements-1.20.0) * [Version 1.19 Release Notes](https://github.com/yandex-qatools/htmlelements/releases/tag/htmlelements-1.19) * [Version 1.18 Release Notes](https://github.com/yandex-qatools/htmlelements/releases/tag/htmlelements-1.18) * [Version 1.17 Release Notes](https://github.com/yandex-qatools/htmlelements/releases/tag/htmlelements-1.17) @@ -43,7 +44,7 @@ Maven dependencies for Html Elements core: ru.yandex.qatools.htmlelements htmlelements-java - 1.19 + 1.21.0 ``` @@ -53,7 +54,7 @@ And for Thucydides integration: ru.yandex.qatools.htmlelements htmlelements-thucydides - 1.19 + 1.21.0 ``` @@ -63,7 +64,7 @@ Or you can include all modules at once if needed: ru.yandex.qatools.htmlelements htmlelements-all - 1.19 + 1.21.0 ``` diff --git a/htmlelements-all/pom.xml b/htmlelements-all/pom.xml index 671bca8a..237a2052 100644 --- a/htmlelements-all/pom.xml +++ b/htmlelements-all/pom.xml @@ -5,7 +5,7 @@ htmlelements ru.yandex.qatools.htmlelements - 1.20.1-SNAPSHOT + 1.21.0-SNAPSHOT htmlelements-all diff --git a/htmlelements-java/pom.xml b/htmlelements-java/pom.xml index edbed86f..d71b1824 100644 --- a/htmlelements-java/pom.xml +++ b/htmlelements-java/pom.xml @@ -5,14 +5,14 @@ ru.yandex.qatools.htmlelements htmlelements - 1.20.1-SNAPSHOT + 1.21.0-SNAPSHOT htmlelements-java Yandex QATools HtmlElements For Java - 3.141.59 + 4.1.0 0.7 1.9.8 diff --git a/htmlelements-java/src/main/java/ru/yandex/qatools/htmlelements/element/HtmlElement.java b/htmlelements-java/src/main/java/ru/yandex/qatools/htmlelements/element/HtmlElement.java index e00e67f7..13606290 100644 --- a/htmlelements-java/src/main/java/ru/yandex/qatools/htmlelements/element/HtmlElement.java +++ b/htmlelements-java/src/main/java/ru/yandex/qatools/htmlelements/element/HtmlElement.java @@ -7,7 +7,7 @@ import org.openqa.selenium.OutputType; import org.openqa.selenium.WebElement; import org.openqa.selenium.WebDriverException; -import org.openqa.selenium.internal.WrapsElement; +import org.openqa.selenium.WrapsElement; import org.openqa.selenium.Rectangle; import java.util.List; diff --git a/htmlelements-java/src/main/java/ru/yandex/qatools/htmlelements/element/TypifiedElement.java b/htmlelements-java/src/main/java/ru/yandex/qatools/htmlelements/element/TypifiedElement.java index 26a9e707..167e9c0c 100644 --- a/htmlelements-java/src/main/java/ru/yandex/qatools/htmlelements/element/TypifiedElement.java +++ b/htmlelements-java/src/main/java/ru/yandex/qatools/htmlelements/element/TypifiedElement.java @@ -7,7 +7,7 @@ import org.openqa.selenium.Point; import org.openqa.selenium.Rectangle; import org.openqa.selenium.WebElement; -import org.openqa.selenium.internal.WrapsElement; +import org.openqa.selenium.WrapsElement; import java.util.List; diff --git a/htmlelements-java/src/main/java/ru/yandex/qatools/htmlelements/loader/decorator/ProxyFactory.java b/htmlelements-java/src/main/java/ru/yandex/qatools/htmlelements/loader/decorator/ProxyFactory.java index d9681681..8d90090c 100644 --- a/htmlelements-java/src/main/java/ru/yandex/qatools/htmlelements/loader/decorator/ProxyFactory.java +++ b/htmlelements-java/src/main/java/ru/yandex/qatools/htmlelements/loader/decorator/ProxyFactory.java @@ -2,7 +2,7 @@ import org.openqa.selenium.WebElement; import org.openqa.selenium.interactions.Locatable; -import org.openqa.selenium.internal.WrapsElement; +import org.openqa.selenium.WrapsElement; import ru.yandex.qatools.htmlelements.element.HtmlElement; import ru.yandex.qatools.htmlelements.element.TypifiedElement; diff --git a/htmlelements-matchers/pom.xml b/htmlelements-matchers/pom.xml index 1c91e006..6f9df9ba 100644 --- a/htmlelements-matchers/pom.xml +++ b/htmlelements-matchers/pom.xml @@ -4,7 +4,7 @@ ru.yandex.qatools.htmlelements htmlelements - 1.20.1-SNAPSHOT + 1.21.0-SNAPSHOT htmlelements-matchers diff --git a/htmlelements-matchers/src/main/java/ru/yandex/qatools/htmlelements/matchers/WrapsElementMatchers.java b/htmlelements-matchers/src/main/java/ru/yandex/qatools/htmlelements/matchers/WrapsElementMatchers.java index e1f3f9f6..3979d619 100644 --- a/htmlelements-matchers/src/main/java/ru/yandex/qatools/htmlelements/matchers/WrapsElementMatchers.java +++ b/htmlelements-matchers/src/main/java/ru/yandex/qatools/htmlelements/matchers/WrapsElementMatchers.java @@ -2,7 +2,7 @@ import org.hamcrest.Matcher; import org.openqa.selenium.WebElement; -import org.openqa.selenium.internal.WrapsElement; +import org.openqa.selenium.WrapsElement; import ru.yandex.qatools.htmlelements.matchers.common.WrapsElementMatcher; /** diff --git a/htmlelements-matchers/src/main/java/ru/yandex/qatools/htmlelements/matchers/common/WrapsElementMatcher.java b/htmlelements-matchers/src/main/java/ru/yandex/qatools/htmlelements/matchers/common/WrapsElementMatcher.java index b8a1ce0f..ac4a3eaf 100644 --- a/htmlelements-matchers/src/main/java/ru/yandex/qatools/htmlelements/matchers/common/WrapsElementMatcher.java +++ b/htmlelements-matchers/src/main/java/ru/yandex/qatools/htmlelements/matchers/common/WrapsElementMatcher.java @@ -5,7 +5,7 @@ import org.hamcrest.Matcher; import org.hamcrest.TypeSafeMatcher; import org.openqa.selenium.WebElement; -import org.openqa.selenium.internal.WrapsElement; +import org.openqa.selenium.WrapsElement; /** * This matcher allows you to use {@link WebElement} matchers with objects implementing {@link WrapsElement} interface. diff --git a/htmlelements-thucydides/pom.xml b/htmlelements-thucydides/pom.xml index 0367a2ea..aadbbae5 100644 --- a/htmlelements-thucydides/pom.xml +++ b/htmlelements-thucydides/pom.xml @@ -3,7 +3,7 @@ htmlelements ru.yandex.qatools.htmlelements - 1.20.1-SNAPSHOT + 1.21.0-SNAPSHOT 4.0.0 diff --git a/pom.xml b/pom.xml index afe57440..5e075d8a 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ ru.yandex.qatools.htmlelements htmlelements - 1.20.1-SNAPSHOT + 1.21.0-SNAPSHOT pom Yandex QATools HtmlElements