Update documentation in readiness for v0.9.8 release

Author: rnorth

Diff for: docs/ROADMAP.md

@@ -17,7 +17,6 @@ Exact future features aren't set in stone, but here are the principles we should
 This list may cross over with the [issues list](https://github.com/testcontainers/testcontainers-java/issues) some times.
 
 * **Better documentation and log messages**. We need this.
-* **Support docker machine**. Docker machine will replace boot2docker and thus we should support it for users on OS X.
 * **Database state snapshotting**. Some projects have complex test data that is time consuming to reload. This means that either testing takes a very long time (test data has to be reloaded often), or tests aren't sufficiently independent (test data is not reloaded and therefore tests aren't independent). Testcontainers should provide a way to snapshot DB state and quickly reload that state. Docker [native Checkpoint/Restore In Userspace](http://blog.kubernetes.io/2015/07/how-did-quake-demo-from-dockercon-work.html) looks like the best way to accomplish this.
 * **Support docker images pulled from private registries**
 * **Support integration testing in other languages/environments**. .NET and NodeJS seem like sensible options here.

Diff for: docs/index.md

@@ -34,15 +34,15 @@ TestContainers is distributed in a handful of Maven modules:
 * **testcontainers** for just core functionality and generic containers support
 * **mysql**, **postgresql** or **oracle-xe** for database container support
 * **selenium** for selenium/webdriver support
-* **docker-compose** for Docker Compose support (in v.0.9.8, not yet released)
+* **docker-compose** for Docker Compose support
 * **nginx** for nginx container support
 
 In the dependency description below, replace `--artifact name--` as appropriate:
 
     <dependency>
         <groupId>org.testcontainers</groupId>
         <artifactId>--artifact name--</artifactId>
-        <version>0.9.7</version>
+        <version>0.9.8</version>
     </dependency>
 
 > **Note**: Testcontainers uses the docker-java client library, which in turn depends on JAX-RS and various Jersey

Diff for: docs/usage/docker_compose.md

@@ -1,7 +1,5 @@
 # Docker Compose
 
-> Note this will be in v0.9.8, which is not yet released
-
 ## Benefits
 
 Similar to [generic containers](generic_containers) support, it's also possible to run a bespoke set of services

Diff for: docs/usage/webdriver_containers.md

@@ -22,8 +22,8 @@ every test.
 The following field in your JUnit UI test class will prepare a container running Chrome:
 
         @Rule
-        public BrowserWebDriverContainerRule chrome = 
-            new BrowserWebDriverContainerRule()
+        public BrowserWebDriverContainer chrome =
+            new BrowserWebDriverContainer()
                     .withDesiredCapabilities(DesiredCapabilities.chrome());
 
 Now, instead of instantiating an instance of WebDriver directly, use the following to obtain an instance inside your
@@ -45,12 +45,12 @@ Docker container can reach. Use the `getHostIpAddress()` method, e.g.:
 
 At the moment, Chrome and Firefox are supported. To switch, simply change the first parameter to the rule constructor:
 
-    new BrowserWebDriverContainerRule(
+    new BrowserWebDriverContainer()
                     .withDesiredCapabilities(DesiredCapabilities.chrome());
         
 or
 
-    new BrowserWebDriverContainerRule(
+    new BrowserWebDriverContainer()
                     .withDesiredCapabilities(DesiredCapabilities.firefox());
 
 ### Recording videos
@@ -60,18 +60,18 @@ just for failing tests.
 
 To do this, simply add extra parameters to the rule constructor:
 
-    new BrowserWebDriverContainerRule(
+    new BrowserWebDriverContainer()
                     .withDesiredCapabilities(DesiredCapabilities.chrome())
                     .withRecordingMode(VncRecordingMode.RECORD_ALL, new File("./target/"))
 
 or if you only want videos for test failures:
 
-    new BrowserWebDriverContainerRule(
+    new BrowserWebDriverContainer()
                     .withDesiredCapabilities(DesiredCapabilities.chrome())
                     .withRecordingMode(VncRecordingMode.RECORD_FAILING, new File("./target/"))
 
 Note that the seconds parameter to `withRecordingMode` should be a directory where recordings can be saved.
 
 ## More examples
 
-A few different examples are shown in [SimpleWebDriverContainerTest.java](https://github.com/testcontainers/testcontainers-java/blob/master/modules/selenium/src/test/java/org/testcontainers/junit/SimpleWebDriverContainerTest.java).
+A few different examples are shown in [ChromeWebDriverContainerTest.java](https://github.com/testcontainers/testcontainers-java/blob/master/modules/selenium/src/test/java/org/testcontainers/junit/ChromeWebDriverContainerTest.java).

Diff for: modules/selenium/src/test/java/org/testcontainers/junit/BaseWebDriverContainerTest.java

@@ -1,12 +1,14 @@
 package org.testcontainers.junit;
 
+import org.jetbrains.annotations.NotNull;
 import org.openqa.selenium.By;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.remote.RemoteWebDriver;
 import org.testcontainers.containers.BrowserWebDriverContainer;
 
 import java.util.List;
 import java.util.Random;
+import java.util.concurrent.TimeUnit;
 
 import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
 
@@ -16,7 +18,7 @@
 public class BaseWebDriverContainerTest {
 
     protected void doSimpleWebdriverTest(BrowserWebDriverContainer rule) {
-        RemoteWebDriver driver = rule.getWebDriver();
+        RemoteWebDriver driver = setupDriverFromRule(rule);
         System.out.println("Selenium remote URL is: " + rule.getSeleniumAddress());
         System.out.println("VNC URL is: " + rule.getVncAddress());
 
@@ -28,8 +30,15 @@ protected void doSimpleWebdriverTest(BrowserWebDriverContainer rule) {
         assertEquals("the word 'testcontainers' appears in the search box", "testcontainers", driver.findElement(By.name("q")).getAttribute("value"));
     }
 
-    protected void doSimpleExplore(BrowserWebDriverContainer rule) {
+    @NotNull
+    private RemoteWebDriver setupDriverFromRule(BrowserWebDriverContainer rule) {
         RemoteWebDriver driver = rule.getWebDriver();
+        driver.manage().timeouts().implicitlyWait(30, TimeUnit.SECONDS);
+        return driver;
+    }
+
+    protected void doSimpleExplore(BrowserWebDriverContainer rule) {
+        RemoteWebDriver driver = setupDriverFromRule(rule);
         driver.get("http://en.wikipedia.org/wiki/Randomness");
 
         loop: