Catch driver start-up failures.

mpichlin · Aug 13, 2014 · ecaa920 · ecaa920
1 parent 7720e2a
commit ecaa920
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/javascript/node/selenium-webdriver/lib/test/index.js b/javascript/node/selenium-webdriver/lib/test/index.js
@@ -158,8 +158,9 @@ function TestEnvironment(browserName, server) {
 
   this.dispose = function() {
     if (driver) {
-      driver.quit();
+      var d = driver;
       driver = null;
+      return d.quit();
     }
   };
 
@@ -221,12 +222,12 @@ function suite(fn, opt_options) {
 
         testing.beforeEach(function() {
           if (env.autoCreateDriver) {
-            env.createDriver();
+            return env.createDriver().getSession();  // Catch start-up failures.
           }
         });
 
         testing.after(function() {
-          env.dispose();
+          return env.dispose();
         });
 
         fn(env);