commit 3fbadaf60eaf10c8a3bc41f8e5741d8a852dff64 Author: Mauro Talevi <mauro.tal...@aquilonia.org> AuthorDate: Tue, 21 May 2013 20:35:44 +0200 Commit: Mauro Talevi <mauro.tal...@aquilonia.org> CommitDate: Tue, 21 May 2013 20:35:44 +0200
JBEHAVE-914: Made Actions builder available to WebDriverPage. diff --git a/web-selenium/src/main/java/org/jbehave/web/selenium/WebDriverPage.java b/web-selenium/src/main/java/org/jbehave/web/selenium/WebDriverPage.java index a7ed5f4..8932dda 100644 --- a/web-selenium/src/main/java/org/jbehave/web/selenium/WebDriverPage.java +++ b/web-selenium/src/main/java/org/jbehave/web/selenium/WebDriverPage.java @@ -1,5 +1,8 @@ package org.jbehave.web.selenium; +import java.util.List; +import java.util.Set; + import org.openqa.selenium.By; import org.openqa.selenium.Capabilities; import org.openqa.selenium.HasCapabilities; @@ -9,9 +12,7 @@ import org.openqa.selenium.Keyboard; import org.openqa.selenium.Mouse; import org.openqa.selenium.WebDriver; import org.openqa.selenium.WebElement; - -import java.util.List; -import java.util.Set; +import org.openqa.selenium.interactions.Actions; /** * Abstract base class for pages that use the WebDriver API. It contains common @@ -27,11 +28,14 @@ public abstract class WebDriverPage implements WebDriver, HasInputDevices, Javas this.driverProvider = driverProvider; } - protected WebDriverProvider getDriverProvider() { return driverProvider; } + protected Actions getActions(){ + return new Actions(driverProvider.get()); + } + public void get(String url) { driverProvider.get().get(url); } @@ -45,37 +49,30 @@ public abstract class WebDriverPage implements WebDriver, HasInputDevices, Javas } public List<WebElement> findElements(By by) { - return driverProvider.get().findElements(by); } public WebElement findElement(By by) { - return driverProvider.get().findElement(by); } public String getPageSource() { - return driverProvider.get().getPageSource(); } public void close() { - driverProvider.get().close(); } public void quit() { - driverProvider.get().quit(); } public Set<String> getWindowHandles() { - return driverProvider.get().getWindowHandles(); } public String getWindowHandle() { - return driverProvider.get().getWindowHandle(); }