Merge pull request #227 from FluentLenium/feature/selenium-2.53

Upgrade Selenium to 2.53
FluentLenium · Mar 31, 2016 · 1643d6a · 1643d6a
2 parents bae7309 + 5227d84
commit 1643d6a
Show file tree

Hide file tree

Showing 19 changed files with 160 additions and 12 deletions.
diff --git a/fluentlenium-assertj/pom.xml b/fluentlenium-assertj/pom.xml
@@ -24,6 +24,11 @@
             <artifactId>assertj-core</artifactId>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>org.seleniumhq.selenium</groupId>
+            <artifactId>htmlunit-driver</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>

diff --git a/fluentlenium-assertj/src/main/java/org/fluentlenium/assertj/custom/FluentListAssert.java b/fluentlenium-assertj/src/main/java/org/fluentlenium/assertj/custom/FluentListAssert.java
@@ -1,6 +1,5 @@
 package org.fluentlenium.assertj.custom;
 
-import org.apache.commons.lang3.StringUtils;
 import org.assertj.core.api.AbstractAssert;
 import org.fluentlenium.core.domain.FluentList;
 
@@ -81,7 +80,15 @@ public FluentListAssert hasClass(String classToFind) {
             if (classesLst.contains(classToFind)) return this;
         }
 
-        super.failWithMessage("No selected elements has class: " + classToFind + " . Actual classes found : " + StringUtils.join(classesFromElements, ", "));
+        StringBuilder sb = new StringBuilder();
+        for (String classFromElement : classesFromElements) {
+            if (sb.length() > 0) {
+                sb.append(", ");
+            }
+            sb.append(classFromElement);
+        }
+
+        super.failWithMessage("No selected elements has class: " + classToFind + " . Actual classes found : " + sb.toString());
         return this;
     }
 

diff --git a/fluentlenium-core/pom.xml b/fluentlenium-core/pom.xml
@@ -24,6 +24,11 @@
             <artifactId>junit</artifactId>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.seleniumhq.selenium</groupId>
+            <artifactId>htmlunit-driver</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>

diff --git a/fluentlenium-core/src/main/java/org/fluentlenium/core/events/EventAdapter.java b/fluentlenium-core/src/main/java/org/fluentlenium/core/events/EventAdapter.java
@@ -44,6 +44,16 @@ public void afterNavigateForward(final WebDriver driver) {
         this.listener.afterNavigateForward(driver);
     }
 
+    @Override
+    public void beforeNavigateRefresh(WebDriver driver) {
+        this.listener.beforeNavigateRefresh(driver);
+    }
+
+    @Override
+    public void afterNavigateRefresh(WebDriver driver) {
+        this.listener.afterNavigateRefresh(driver);
+    }
+
     @Override
     public void beforeFindBy(final By by, final WebElement element, final WebDriver driver) {
         this.listener.beforeFindBy(by, element == null ? null : new FluentWebElement(element),

diff --git a/fluentlenium-core/src/main/java/org/fluentlenium/core/events/EventListener.java b/fluentlenium-core/src/main/java/org/fluentlenium/core/events/EventListener.java
@@ -150,4 +150,18 @@ public interface EventListener {
      */
     void onException(final Throwable throwable, final WebDriver driver);
 
+    /**
+     * Called before {@link org.openqa.selenium.WebDriver.Navigation#refresh navigate().refresh()}.
+     *
+     * @param driver WebDriver
+     */
+    void beforeNavigateRefresh(WebDriver driver);
+
+    /**
+     * Called after {@link org.openqa.selenium.WebDriver.Navigation#refresh navigate().refresh()}. Not called,
+     * if an exception is thrown.
+     *
+     * @param driver WebDriver
+     */
+    void afterNavigateRefresh(WebDriver driver);
 }
diff --git a/fluentlenium-core/src/main/java/org/fluentlenium/core/events/EventsRegistry.java b/fluentlenium-core/src/main/java/org/fluentlenium/core/events/EventsRegistry.java
@@ -29,6 +29,10 @@ public class EventsRegistry {
 
     List<NavigateAllListener> afterNavigate = new ArrayList<NavigateAllListener>();
 
+    List<NavigateListener> beforeNavigateRefresh = new ArrayList<>();
+
+    List<NavigateListener> afterNavigateRefresh = new ArrayList<>();
+
     List<FindByListener> beforeFindBy = new ArrayList<FindByListener>();
 
     List<FindByListener> afterFindBy = new ArrayList<FindByListener>();
@@ -107,6 +111,16 @@ public EventsRegistry afterNavigate(final NavigateAllListener listener) {
         return this;
     }
 
+    public EventsRegistry beforeNavigateRefresh(final NavigateListener listener) {
+        this.beforeNavigateRefresh.add(listener);
+        return this;
+    }
+
+    public EventsRegistry afterNavigateRefresh(final NavigateListener listener) {
+        this.afterNavigateRefresh.add(listener);
+        return this;
+    }
+
     public EventsRegistry beforeFindBy(final FindByListener listener) {
         this.beforeFindBy.add(listener);
         return this;

diff --git a/fluentlenium-core/src/main/java/org/fluentlenium/core/events/EventsSupport.java b/fluentlenium-core/src/main/java/org/fluentlenium/core/events/EventsSupport.java
@@ -72,6 +72,27 @@ public void afterNavigateForward(final WebDriver driver) {
         }
     }
 
+
+    @Override
+    public void beforeNavigateRefresh(WebDriver driver) {
+        for (NavigateListener listener : this.eventsRegistry.beforeNavigateRefresh) {
+            listener.on(driver);
+        }
+        for (NavigateAllListener listener : this.eventsRegistry.beforeNavigate) {
+            listener.on(null, driver, NavigateAllListener.Direction.REFRESH);
+        }
+    }
+
+    @Override
+    public void afterNavigateRefresh(WebDriver driver) {
+        for (NavigateListener listener : this.eventsRegistry.afterNavigateRefresh) {
+            listener.on(driver);
+        }
+        for (NavigateAllListener listener : this.eventsRegistry.afterNavigate) {
+            listener.on(null, driver, NavigateAllListener.Direction.REFRESH);
+        }
+    }
+
     @Override
     public void beforeFindBy(final By by, final FluentWebElement element, final WebDriver driver) {
         for (FindByListener listener : this.eventsRegistry.beforeFindBy) {

diff --git a/fluentlenium-core/src/main/java/org/fluentlenium/core/events/NavigateAllListener.java b/fluentlenium-core/src/main/java/org/fluentlenium/core/events/NavigateAllListener.java
@@ -5,7 +5,7 @@
 public interface NavigateAllListener {
 
     enum Direction {
-        BACK, FORWARD
+        BACK, FORWARD, REFRESH
     }
 
     void on(final String url, final WebDriver driver, final Direction direction);

diff --git a/fluentlenium-core/src/test/java/org/fluentlenium/integration/EventsTest.java b/fluentlenium-core/src/test/java/org/fluentlenium/integration/EventsTest.java
@@ -4,8 +4,10 @@
 import org.fluentlenium.core.events.ElementListener;
 import org.fluentlenium.core.events.FindByListener;
 import org.fluentlenium.core.events.NavigateAllListener;
+import org.fluentlenium.core.events.NavigateListener;
 import org.fluentlenium.integration.localtest.LocalFluentCase;
 import org.junit.Test;
+import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.openqa.selenium.By;
 import org.openqa.selenium.WebDriver;
@@ -30,7 +32,7 @@ public void clickOn() {
         click("button");
 
         Mockito.verify(beforeListener, Mockito.times(1)).on(Mockito.<FluentWebElement>anyObject(), Mockito.<WebDriver>anyObject());
-        Mockito.verify(beforeListener, Mockito.times(1)).on(Mockito.<FluentWebElement>anyObject(), Mockito.<WebDriver>anyObject());
+        Mockito.verify(afterListener, Mockito.times(1)).on(Mockito.<FluentWebElement>anyObject(), Mockito.<WebDriver>anyObject());
     }
 
     @Test
@@ -45,7 +47,7 @@ public void findBy() {
         findFirst("button");
 
         Mockito.verify(beforeListener, Mockito.times(1)).on(Mockito.<By>anyObject(), Mockito.<FluentWebElement>anyObject(), Mockito.<WebDriver>anyObject());
-        Mockito.verify(beforeListener, Mockito.times(1)).on(Mockito.<By>anyObject(), Mockito.<FluentWebElement>anyObject(), Mockito.<WebDriver>anyObject());
+        Mockito.verify(afterListener, Mockito.times(1)).on(Mockito.<By>anyObject(), Mockito.<FluentWebElement>anyObject(), Mockito.<WebDriver>anyObject());
     }
 
     @Test
@@ -58,7 +60,30 @@ public void navigate() {
         goTo(DEFAULT_URL);
 
         Mockito.verify(beforeListener, Mockito.times(1)).on(Mockito.eq(DEFAULT_URL), Mockito.<WebDriver>anyObject(), Mockito.<NavigateAllListener.Direction>anyObject());
-        Mockito.verify(beforeListener, Mockito.times(1)).on(Mockito.eq(DEFAULT_URL), Mockito.<WebDriver>anyObject(), Mockito.<NavigateAllListener.Direction>anyObject());
+        Mockito.verify(afterListener, Mockito.times(1)).on(Mockito.eq(DEFAULT_URL), Mockito.<WebDriver>anyObject(), Mockito.<NavigateAllListener.Direction>anyObject());
+
+        getDriver().navigate().refresh();
+
+        Mockito.verify(beforeListener, Mockito.times(1)).on((String)Mockito.isNull(), Mockito.<WebDriver>anyObject(), Mockito.eq(NavigateAllListener.Direction.REFRESH));
+        Mockito.verify(afterListener, Mockito.times(1)).on((String)Mockito.isNull(), Mockito.<WebDriver>anyObject(), Mockito.eq(NavigateAllListener.Direction.REFRESH));
+
+    }
+
+    @Test
+    public void refresh() {
+        final NavigateListener beforeListener = Mockito.mock(NavigateListener.class);
+        final NavigateListener afterListener = Mockito.mock(NavigateListener.class);
+
+        events().beforeNavigateRefresh(beforeListener);
+        events().afterNavigateRefresh(afterListener);
+        goTo(DEFAULT_URL);
+
+        Mockito.verify(beforeListener, Mockito.times(0)).on(Mockito.<WebDriver>anyObject());
+        Mockito.verify(afterListener, Mockito.times(0)).on(Mockito.<WebDriver>anyObject());
+
+        getDriver().navigate().refresh();
+        Mockito.verify(beforeListener, Mockito.times(1)).on(Mockito.<WebDriver>anyObject());
+        Mockito.verify(afterListener, Mockito.times(1)).on(Mockito.<WebDriver>anyObject());
     }
 
 }
diff --git a/fluentlenium-cucumber/pom.xml b/fluentlenium-cucumber/pom.xml
@@ -36,7 +36,11 @@
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
         </dependency>
-
+        <dependency>
+            <groupId>org.seleniumhq.selenium</groupId>
+            <artifactId>htmlunit-driver</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>info.cukes</groupId>
             <artifactId>cucumber-junit</artifactId>

diff --git a/fluentlenium-festassert/pom.xml b/fluentlenium-festassert/pom.xml
@@ -19,6 +19,11 @@
             <artifactId>fluentlenium-core</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.seleniumhq.selenium</groupId>
+            <artifactId>htmlunit-driver</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.easytesting</groupId>
             <artifactId>fest-assert</artifactId>

diff --git a/fluentlenium-it/src/it/junit/junit-common/pom.xml b/fluentlenium-it/src/it/junit/junit-common/pom.xml
@@ -21,6 +21,10 @@
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.seleniumhq.selenium</groupId>
+            <artifactId>htmlunit-driver</artifactId>
+        </dependency>
     </dependencies>
 
-</project>
+</project>
diff --git a/fluentlenium-it/src/it/junit/junit-default/pom.xml b/fluentlenium-it/src/it/junit/junit-default/pom.xml
@@ -29,6 +29,11 @@
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.seleniumhq.selenium</groupId>
+            <artifactId>htmlunit-driver</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>xml-apis</groupId>
             <artifactId>xml-apis</artifactId>

diff --git a/fluentlenium-it/src/it/junit/pom.xml b/fluentlenium-it/src/it/junit/pom.xml
@@ -33,6 +33,11 @@
                 <artifactId>junit-common</artifactId>
                 <version>testing</version>
             </dependency>
+            <dependency>
+                <groupId>org.seleniumhq.selenium</groupId>
+                <artifactId>htmlunit-driver</artifactId>
+                <version>2.20</version>
+            </dependency>
             <dependency>
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>
@@ -69,4 +74,4 @@
         </profile>
     </profiles>
 
-</project>
+</project>
diff --git a/fluentlenium-it/src/it/testng/pom.xml b/fluentlenium-it/src/it/testng/pom.xml
@@ -38,6 +38,11 @@
                 <artifactId>fluentlenium-testng</artifactId>
                 <version>${it.project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.seleniumhq.selenium</groupId>
+                <artifactId>htmlunit-driver</artifactId>
+                <version>2.20</version>
+            </dependency>
             <dependency>
                 <groupId>org.testng</groupId>
                 <artifactId>testng</artifactId>
@@ -74,4 +79,4 @@
         </profile>
     </profiles>
 
-</project>
+</project>
diff --git a/fluentlenium-it/src/it/testng/testng-common/pom.xml b/fluentlenium-it/src/it/testng/testng-common/pom.xml
@@ -21,6 +21,10 @@
             <groupId>org.fluentlenium</groupId>
             <artifactId>fluentlenium-testng</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.seleniumhq.selenium</groupId>
+            <artifactId>htmlunit-driver</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>

diff --git a/fluentlenium-it/src/it/testng/testng-default/pom.xml b/fluentlenium-it/src/it/testng/testng-default/pom.xml
@@ -28,6 +28,11 @@
             <artifactId>fluentlenium-testng</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.seleniumhq.selenium</groupId>
+            <artifactId>htmlunit-driver</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
@@ -40,4 +45,4 @@
         </dependency>
     </dependencies>
 
-</project>
+</project>
diff --git a/fluentlenium-testng/pom.xml b/fluentlenium-testng/pom.xml
@@ -30,6 +30,11 @@
             <version>${testng.version}</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.seleniumhq.selenium</groupId>
+            <artifactId>htmlunit-driver</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -97,7 +97,12 @@
             <dependency>
                 <groupId>org.seleniumhq.selenium</groupId>
                 <artifactId>selenium-java</artifactId>
-                <version>2.49.0</version>
+                <version>2.53.0</version>
+            </dependency>
+            <dependency>
+                <groupId>org.seleniumhq.selenium</groupId>
+                <artifactId>htmlunit-driver</artifactId>
+                <version>2.20</version>
             </dependency>
             <dependency>
                 <groupId>junit</groupId>