Merge pull request #162 from 0I0u3uk/feature/support_selenium_4

#158 Added supporting Selenium 4
yandex-qatools · Dec 2, 2021 · acf5740 · acf5740
2 parents fb10b19 + 54ddcaa
commit acf5740
Show file tree

Hide file tree

Showing 11 changed files with 15 additions and 14 deletions.
diff --git 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:
 <dependency>
     <groupId>ru.yandex.qatools.htmlelements</groupId>
     <artifactId>htmlelements-java</artifactId>
-    <version>1.19</version> <!-- 1.18+ is SELENIUM 3.5.1+ compatible -->
+    <version>1.21.0</version> <!-- 1.21+ is SELENIUM 4.1.0 compatible -->
 </dependency>
 ```
 
@@ -53,7 +54,7 @@ And for Thucydides integration:
 <dependency>
     <groupId>ru.yandex.qatools.htmlelements</groupId>
     <artifactId>htmlelements-thucydides</artifactId>
-    <version>1.19</version>
+    <version>1.21.0</version>
 </dependency>
 ```
 
@@ -63,7 +64,7 @@ Or you can include all modules at once if needed:
 <dependency>
     <groupId>ru.yandex.qatools.htmlelements</groupId>
     <artifactId>htmlelements-all</artifactId>
-    <version>1.19</version>
+    <version>1.21.0</version>
 </dependency>
 ```
 

diff --git a/htmlelements-all/pom.xml b/htmlelements-all/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>htmlelements</artifactId>
         <groupId>ru.yandex.qatools.htmlelements</groupId>
-        <version>1.20.1-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>htmlelements-all</artifactId>

diff --git a/htmlelements-java/pom.xml b/htmlelements-java/pom.xml
@@ -5,14 +5,14 @@
     <parent>
         <groupId>ru.yandex.qatools.htmlelements</groupId>
         <artifactId>htmlelements</artifactId>
-        <version>1.20.1-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>htmlelements-java</artifactId>
     <name>Yandex QATools HtmlElements For Java</name>
 
     <properties>
-        <selenium.version>3.141.59</selenium.version>
+        <selenium.version>4.1.0</selenium.version>
         <phantomjs-maven-plugin.version>0.7</phantomjs-maven-plugin.version>
         <phantomjs.binary.version>1.9.8</phantomjs.binary.version>
     </properties>

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
@@ -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
@@ -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/...ents-java/src/main/java/ru/yandex/qatools/htmlelements/loader/decorator/ProxyFactory.java b/...ents-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
@@ -4,7 +4,7 @@
     <parent>
         <groupId>ru.yandex.qatools.htmlelements</groupId>
         <artifactId>htmlelements</artifactId>
-        <version>1.20.1-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>htmlelements-matchers</artifactId>

diff --git a/...-matchers/src/main/java/ru/yandex/qatools/htmlelements/matchers/WrapsElementMatchers.java b/...-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/...ers/src/main/java/ru/yandex/qatools/htmlelements/matchers/common/WrapsElementMatcher.java b/...ers/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
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>htmlelements</artifactId>
         <groupId>ru.yandex.qatools.htmlelements</groupId>
-        <version>1.20.1-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>ru.yandex.qatools.htmlelements</groupId>
     <artifactId>htmlelements</artifactId>
-    <version>1.20.1-SNAPSHOT</version>
+    <version>1.21.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>Yandex QATools HtmlElements</name>