Merge branch 'master' into stable

* master:
  Add a HiddenObject for getting at off-screen debug text.
  Remove unused FileBoxObject.id field.
  Change TextObject.nowHasText to use Selenium's ExpectedCondition.
  Fix upload location.

buildfile

@@ -4,7 +4,7 @@ require 'buildr/ivy_extension'
 VERSION_NUMBER = ENV['version'] || 'SNAPSHOT'
 
 repositories.remote << "http://repo1.maven.org/maven2/"
-repositories.release_to = 'sftp://joist.ws/var/joist.repo'
+repositories.release_to = 'sftp://joist.ws/var/www/joist.repo'
 repositories.release_to[:permissions] = 0644
 
 # to resolve the ${version} in the ivy.xml

ivy.xml

@@ -6,7 +6,7 @@
     <conf name="sources"/>
   </configurations>
   <dependencies defaultconfmapping="%->default;sources->sources()">
-    <dependency org="org.seleniumhq.selenium" name="selenium-java" rev="2.16.1" conf="compile;sources" />
+    <dependency org="org.seleniumhq.selenium" name="selenium-java" rev="2.37.0" conf="compile;sources" />
     <dependency org="junit" name="junit" rev="4.8.1" conf="compile;sources" />
   </dependencies>
 </ivy-module>

src/main/java/com/bizo/pageobjects/FileBoxObject.java

@@ -4,12 +4,9 @@
 
 public class FileBoxObject extends AbstractElementObject {
 
-  private final String id;
-
   /** Only take an id for our firefox change hack. */
   public FileBoxObject(final PageObject p, final String id) {
     super(p, id);
-    this.id = id;
   }
 
   public void set(File file) {

src/main/java/com/bizo/pageobjects/HiddenObject.java

@@ -0,0 +1,37 @@
+package com.bizo.pageobjects;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
+import org.openqa.selenium.JavascriptExecutor;
+import org.openqa.selenium.WebDriver;
+import org.openqa.selenium.support.ui.ExpectedCondition;
+
+/** A class to get the text of off-screen/debug elements that are otherwise hidden. */
+public class HiddenObject extends AbstractElementObject {
+
+  private final String id;
+
+  public HiddenObject(final PageObject p, final String id) {
+    super(p, id);
+    this.id = id;
+  }
+
+  public String get() {
+    return (String) ((JavascriptExecutor) getWebDriver()).executeScript(//
+      "var d = document.getElementById('" + id + "'); return (d == null) ? '' : d.innerHTML;");
+  }
+
+  public void assertText(final String text) {
+    assertThat(get(), is(text));
+  }
+
+  public ExpectedCondition<Boolean> nowHasText(final String text) {
+    return new ExpectedCondition<Boolean>() {
+      public Boolean apply(WebDriver input) {
+        return text.equals(get());
+      }
+    };
+  }
+
+}

src/main/java/com/bizo/pageobjects/TextObject.java

@@ -4,8 +4,9 @@
 import static org.junit.Assert.assertThat;
 
 import org.openqa.selenium.By;
-
-import com.google.common.base.Supplier;
+import org.openqa.selenium.JavascriptExecutor;
+import org.openqa.selenium.WebDriver;
+import org.openqa.selenium.support.ui.ExpectedCondition;
 
 public class TextObject extends AbstractElementObject {
 
@@ -29,12 +30,18 @@ public void assertText(final String text) {
     assertThat(get(), is(text));
   }
 
-  public Supplier<Boolean> nowHasText(final String text) {
-    return new Supplier<Boolean>() {
-      public Boolean get() {
-        return text.equals(TextObject.this.get());
+  public ExpectedCondition<Boolean> nowHasText(final String text) {
+    return new ExpectedCondition<Boolean>() {
+      public Boolean apply(WebDriver input) {
+        return text.equals(get());
       }
     };
   }
 
+  private static String getHiddenText(final WebDriver d, final String elementId) {
+    return (String) ((JavascriptExecutor) d).executeScript(//
+      "var d = document.getElementById('" + elementId + "'); return (d == null) ? '' : d.innerHTML;");
+  }
+
+
 }