commit 939f41d13fb7ba5c9738055cba1dc1c05659f800 Author: Paul Hammant <p...@hammant.org> AuthorDate: Tue Mar 13 14:24:38 2012 -0500 Commit: Paul Hammant <p...@hammant.org> CommitDate: Tue Mar 13 14:24:38 2012 -0500
upgrade fleunt-selenium dependency diff --git a/etsy-stories-java-spring/src/main/java/org/jbehave/tutorials/etsy/pages/fluent/FluentSearchResults.java b/etsy-stories-java-spring/src/main/java/org/jbehave/tutorials/etsy/pages/fluent/FluentSearchResults.java index bb297ff..914a6fb 100644 --- a/etsy-stories-java-spring/src/main/java/org/jbehave/tutorials/etsy/pages/fluent/FluentSearchResults.java +++ b/etsy-stories-java-spring/src/main/java/org/jbehave/tutorials/etsy/pages/fluent/FluentSearchResults.java @@ -5,9 +5,11 @@ import org.jbehave.web.selenium.WebDriverProvider; import org.openqa.selenium.WebElement; import org.seleniumhq.selenium.fluent.FluentMatcher; import org.seleniumhq.selenium.fluent.FluentWebElements; +import org.seleniumhq.selenium.fluent.Period; import static org.openqa.selenium.By.className; import static org.openqa.selenium.By.xpath; +import static org.seleniumhq.selenium.fluent.Period.secs; public class FluentSearchResults extends FluentPage implements SearchResults { @@ -30,7 +32,7 @@ public class FluentSearchResults extends FluentPage implements SearchResults { private FluentWebElements getResultElements() { - return links(className("listing-thumb")); + return within(secs(2)).links(className("listing-thumb")); } private FluentMatcher lowerCaseTitleContaining(final String thing) { diff --git a/etsy-stories-java-spring/src/main/java/org/jbehave/tutorials/etsy/pages/fluent/FluentSite.java b/etsy-stories-java-spring/src/main/java/org/jbehave/tutorials/etsy/pages/fluent/FluentSite.java index 22ea391..091c466 100644 --- a/etsy-stories-java-spring/src/main/java/org/jbehave/tutorials/etsy/pages/fluent/FluentSite.java +++ b/etsy-stories-java-spring/src/main/java/org/jbehave/tutorials/etsy/pages/fluent/FluentSite.java @@ -2,8 +2,10 @@ package org.jbehave.tutorials.etsy.pages.fluent; import org.jbehave.tutorials.etsy.pages.Site; import org.jbehave.web.selenium.WebDriverProvider; +import org.seleniumhq.selenium.fluent.Period; import static org.openqa.selenium.By.id; +import static org.seleniumhq.selenium.fluent.Period.secs; public class FluentSite extends FluentPage implements Site { @@ -12,7 +14,7 @@ public class FluentSite extends FluentPage implements Site { } public int cartSize() { - String cartSize = div(id("cart")).getText().replace("Cart", "").trim(); + String cartSize = within(secs(2)).div(id("cart")).getText().replace("Cart", "").trim(); if (cartSize.equals("")) { return 0; } diff --git a/pom.xml b/pom.xml index 8a7459e..e0b7798 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ <jbehave.navigator.version>3.6-SNAPSHOT</jbehave.navigator.version> <jbehave.web.version>3.5-SNAPSHOT</jbehave.web.version> <jbehave.site.version>3.1.1</jbehave.site.version> - <fluent.selenium.version>1.0-beta-6</fluent.selenium.version> + <fluent.selenium.version>1.0</fluent.selenium.version> <selenium.version>2.20.0</selenium.version> </properties>