From 176a9106dd2083ac8fa4d4907809df0f2ffdbad1 Mon Sep 17 00:00:00 2001
From: "igor.martynov" <igor.martynov@team.wrike.com>
Date: Sun, 21 Jan 2018 14:49:26 +0300
Subject: [PATCH] increases selenium version

---
 pom.xml                                                    | 3 +--
 .../java/io/qameta/htmlelements/annotation/FindBy.java     | 2 +-
 .../io/qameta/htmlelements/element/ExtendedWebElement.java | 2 +-
 .../io/qameta/htmlelements/extension/page/GoMethod.java    | 5 +++--
 .../io/qameta/htmlelements/extension/page/IsAtMethod.java  | 7 ++++---
 .../io/qameta/htmlelements/statement/RetryStatement.java   | 6 ++++--
 .../qameta/htmlelements/example/element/SearchArrow.java   | 2 --
 .../io/qameta/htmlelements/example/element/SearchForm.java | 1 -
 .../qameta/htmlelements/example/element/WithSuggest.java   | 4 ----
 9 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/pom.xml b/pom.xml
index d0c7191..3542dd8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,8 +36,7 @@
 
     <properties>
         <compiler.version>1.8</compiler.version>
-
-        <selenium.version>2.53.0</selenium.version>
+        <selenium.version>3.8.1</selenium.version>
     </properties>
 
     <dependencies>
diff --git a/src/main/java/io/qameta/htmlelements/annotation/FindBy.java b/src/main/java/io/qameta/htmlelements/annotation/FindBy.java
index 5b3cbf7..eadba19 100644
--- a/src/main/java/io/qameta/htmlelements/annotation/FindBy.java
+++ b/src/main/java/io/qameta/htmlelements/annotation/FindBy.java
@@ -10,7 +10,7 @@
 import org.openqa.selenium.By;
 import org.openqa.selenium.SearchContext;
 import org.openqa.selenium.WebElement;
-import org.openqa.selenium.internal.Locatable;
+import org.openqa.selenium.interactions.internal.Locatable;
 
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.ElementType;
diff --git a/src/main/java/io/qameta/htmlelements/element/ExtendedWebElement.java b/src/main/java/io/qameta/htmlelements/element/ExtendedWebElement.java
index da31e0d..de86d9b 100644
--- a/src/main/java/io/qameta/htmlelements/element/ExtendedWebElement.java
+++ b/src/main/java/io/qameta/htmlelements/element/ExtendedWebElement.java
@@ -8,7 +8,7 @@
 import io.qameta.htmlelements.matcher.PredicateMatcher;
 import org.hamcrest.Matcher;
 import org.openqa.selenium.WebElement;
-import org.openqa.selenium.internal.Locatable;
+import org.openqa.selenium.interactions.internal.Locatable;
 
 import java.util.function.Predicate;
 
diff --git a/src/main/java/io/qameta/htmlelements/extension/page/GoMethod.java b/src/main/java/io/qameta/htmlelements/extension/page/GoMethod.java
index 6448b37..f976ce3 100644
--- a/src/main/java/io/qameta/htmlelements/extension/page/GoMethod.java
+++ b/src/main/java/io/qameta/htmlelements/extension/page/GoMethod.java
@@ -1,6 +1,6 @@
 package io.qameta.htmlelements.extension.page;
 
-import com.google.common.base.Predicate;
+import com.google.common.base.Function;
 import io.qameta.htmlelements.context.Context;
 import io.qameta.htmlelements.exception.WebPageException;
 import io.qameta.htmlelements.extension.HandleWith;
@@ -39,7 +39,8 @@ public Object handle(Context context, Object proxy, Method method, Object[] args
             new WebDriverWait(driver, 5)
                     .ignoring(Throwable.class)
                     .withMessage(String.format("Couldn't wait for page with url %s to load", url))
-                    .until((Predicate<WebDriver>) (d) -> (d != null && d.getCurrentUrl().equals(url)) &&
+                    .until((Function<? super WebDriver, Boolean>) d ->
+                            (d != null && d.getCurrentUrl().equals(url)) &&
                             WebDriverUtils.pageIsLoaded(d));
             return proxy;
         }
diff --git a/src/main/java/io/qameta/htmlelements/extension/page/IsAtMethod.java b/src/main/java/io/qameta/htmlelements/extension/page/IsAtMethod.java
index 0fbbfed..a1bb026 100644
--- a/src/main/java/io/qameta/htmlelements/extension/page/IsAtMethod.java
+++ b/src/main/java/io/qameta/htmlelements/extension/page/IsAtMethod.java
@@ -1,6 +1,6 @@
 package io.qameta.htmlelements.extension.page;
 
-import com.google.common.base.Predicate;
+import com.google.common.base.Function;
 import io.qameta.htmlelements.context.Context;
 import io.qameta.htmlelements.exception.WebPageException;
 import io.qameta.htmlelements.extension.HandleWith;
@@ -39,8 +39,9 @@ public Object handle(Context context, Object proxy, Method method, Object[] args
             new WebDriverWait(driver, 5)
                     .ignoring(Throwable.class)
                     .withMessage(format("Couldn't wait for page with url %s to load", expectedUrlMacher))
-                    .until((Predicate<WebDriver>) (d) -> (d != null && expectedUrlMacher.matches(d.getCurrentUrl())) &&
-                            WebDriverUtils.pageIsLoaded(d));
+                    .until((Function<? super WebDriver, Boolean>) d ->
+                            (d != null && expectedUrlMacher.matches(d.getCurrentUrl())) &&
+                                    WebDriverUtils.pageIsLoaded(d));
             return proxy;
         }
     }
diff --git a/src/main/java/io/qameta/htmlelements/statement/RetryStatement.java b/src/main/java/io/qameta/htmlelements/statement/RetryStatement.java
index e83c367..efd93d2 100644
--- a/src/main/java/io/qameta/htmlelements/statement/RetryStatement.java
+++ b/src/main/java/io/qameta/htmlelements/statement/RetryStatement.java
@@ -1,6 +1,5 @@
 package io.qameta.htmlelements.statement;
 
-import com.google.common.base.Throwables;
 import org.openqa.selenium.support.ui.Clock;
 import org.openqa.selenium.support.ui.Duration;
 import org.openqa.selenium.support.ui.SystemClock;
@@ -11,6 +10,8 @@
 import java.util.Properties;
 import java.util.concurrent.TimeUnit;
 
+import static com.google.common.base.Throwables.throwIfUnchecked;
+
 /**
  * eroshenkoam
  * 25.02.17
@@ -67,7 +68,8 @@ public Statement apply(Statement statement) throws Throwable {
                             break;
                         }
                     } else {
-                        Throwables.propagate(e);
+                        throwIfUnchecked(e);
+                        throw new RuntimeException(e);
                     }
                 }
             } while ((clock.isNowBefore(end)));
diff --git a/src/test/java/io/qameta/htmlelements/example/element/SearchArrow.java b/src/test/java/io/qameta/htmlelements/example/element/SearchArrow.java
index 526eb40..e767b28 100644
--- a/src/test/java/io/qameta/htmlelements/example/element/SearchArrow.java
+++ b/src/test/java/io/qameta/htmlelements/example/element/SearchArrow.java
@@ -2,11 +2,9 @@
 
 import io.qameta.htmlelements.annotation.Description;
 import io.qameta.htmlelements.annotation.FindBy;
-import io.qameta.htmlelements.annotation.Name;
 import io.qameta.htmlelements.annotation.Param;
 import io.qameta.htmlelements.element.*;
 import io.qameta.htmlelements.example.TestData;
-import io.qameta.htmlelements.extension.DescriptionProvider;
 
 /**
  * @author Artem Eroshenko <erosenkoam@me.com>
diff --git a/src/test/java/io/qameta/htmlelements/example/element/SearchForm.java b/src/test/java/io/qameta/htmlelements/example/element/SearchForm.java
index cb7cba9..bd061be 100644
--- a/src/test/java/io/qameta/htmlelements/example/element/SearchForm.java
+++ b/src/test/java/io/qameta/htmlelements/example/element/SearchForm.java
@@ -1,7 +1,6 @@
 package io.qameta.htmlelements.example.element;
 
 import io.qameta.htmlelements.annotation.FindBy;
-import io.qameta.htmlelements.annotation.Name;
 import io.qameta.htmlelements.element.*;
 import io.qameta.htmlelements.example.TestData;
 import org.openqa.selenium.WebElement;
diff --git a/src/test/java/io/qameta/htmlelements/example/element/WithSuggest.java b/src/test/java/io/qameta/htmlelements/example/element/WithSuggest.java
index 3b4bb07..680db25 100644
--- a/src/test/java/io/qameta/htmlelements/example/element/WithSuggest.java
+++ b/src/test/java/io/qameta/htmlelements/example/element/WithSuggest.java
@@ -4,12 +4,8 @@
 import io.qameta.htmlelements.annotation.FindBy;
 import io.qameta.htmlelements.element.ExtendedList;
 import io.qameta.htmlelements.element.ExtendedWebElement;
-import io.qameta.htmlelements.element.HtmlElement;
-import io.qameta.htmlelements.element.HtmlElementList;
 import io.qameta.htmlelements.example.TestData;
 
-import java.util.List;
-
 /**
  * @author Artem Eroshenko <erosenkoam@me.com>
  */