fix(errors): update webdriverjs, fix asynchronous error output

Add some console logging, remove useless info about the last running
task in the control flow, and fix error where problems reported
from done.fail were getting pushed into the following spec.

Closes #18

Author: juliemr

index.js

@@ -75,8 +75,7 @@ function wrapInControlFlow(globalFn, fnName) {
     function asyncTestFn(fn) {
       return function(done) {
         // deferred object for signaling completion of asychronous function within globalFn
-        var asyncFnDone = webdriver.promise.defer(),
-          originalFail = jasmine.getEnv().fail;
+        var asyncFnDone = webdriver.promise.defer();
 
         if (fn.length === 0) {
           // function with globalFn not asychronous
@@ -86,20 +85,19 @@ function wrapInControlFlow(globalFn, fnName) {
         } else {
           // Add fail method to async done callback and override env fail to
           // reject async done promise
-          jasmine.getEnv().fail = asyncFnDone.fulfill.fail = function(userError) {
+          asyncFnDone.fulfill.fail = function(userError) {
             asyncFnDone.reject(new Error(userError));
           };
+
         }
 
         var flowFinished = flow.execute(function() {
           fn.call(jasmine.getEnv(), asyncFnDone.fulfill);
-        });
+        }, 'Run ' + fnName + ' in control flow');
 
         webdriver.promise.all([asyncFnDone, flowFinished]).then(function() {
-          jasmine.getEnv().fail = originalFail;
           seal(done)();
         }, function(e) {
-          jasmine.getEnv().fail = originalFail;
           e.stack = e.stack + '\n==== async task ====\n' + driverError.stack;
           done.fail(e);
         });
@@ -171,7 +169,7 @@ jasmine.Expectation.prototype.wrapCompare = function(name, matcherFactory) {
           return compare(actual, expected);
         });
       });
-    });
+    }, 'Expect ' + name);
 
     function compare(actual, expected) {
       var args = expected.slice(0);
@@ -258,10 +256,5 @@ OnTimeoutReporter.prototype.specDone = function(result) {
 // get to complete first.
 jasmine.getEnv().addReporter(new OnTimeoutReporter(function() {
   console.warn('A Jasmine spec timed out. Resetting the WebDriver Control Flow.');
-  console.warn('The last active task was: ');
-  console.warn(
-      (flow.activeFrame_ && flow.activeFrame_.getPendingTask() ?
-          flow.activeFrame_.getPendingTask().toString() : 
-          'unknown'));
   flow.reset();
 }));

package.json

@@ -14,7 +14,7 @@
   "devDependencies": {
     "jshint": "2.5.0",
     "jasmine": "2.1.1",
-    "selenium-webdriver": "2.43.4"
+    "selenium-webdriver": "2.45.1"
   },
   "repository": {
     "type": "git",

spec/common.js

@@ -13,39 +13,39 @@ exports.getFakeDriver = function() {
     setUp: function() {
       return flow.execute(function() {
         return webdriver.promise.fulfilled('setup done');
-      });
+      }, 'setUp');
     },
     getValueA: function() {
       return flow.execute(function() {
         return webdriver.promise.delayed(500).then(function() {
           return webdriver.promise.fulfilled('a');
         });
-      });
+      }, 'getValueA');
     },
     getOtherValueA: function() {
       return flow.execute(function() {
         return webdriver.promise.fulfilled('a');
-      });
+      }, 'getOtherValueA');
     },
     getValueB: function() {
       return flow.execute(function() {
         return webdriver.promise.fulfilled('b');
-      });
+      }, 'getValueB');
     },
     getBigNumber: function() {
       return flow.execute(function() {
         return webdriver.promise.fulfilled(1111);
-      });
+      }, 'getBigNumber');
     },
     getSmallNumber: function() {
       return flow.execute(function() {
         return webdriver.promise.fulfilled(11);
-      });
+      }, 'getSmallNumber');
     },
     getDecimalNumber: function() {
         return flow.execute(function() {
           return webdriver.promise.fulfilled(3.14159);
-        });
+        }, 'getDecimalNumber');
       },
     getDisplayedElement: function() {
       return flow.execute(function() {
@@ -54,7 +54,7 @@ exports.getFakeDriver = function() {
             return webdriver.promise.fulfilled(true);
           }
         });
-      });
+      }, 'getDisplayedElement');
     },
     getHiddenElement: function() {
       return flow.execute(function() {
@@ -63,7 +63,7 @@ exports.getFakeDriver = function() {
             return webdriver.promise.fulfilled(false);
           }
         });
-      });
+      }, 'getHiddenElement');
     }
   };
 };

spec/errorSpec.js

@@ -31,7 +31,7 @@ describe('things that should fail', function() {
   });
 
   it('should pass errors from done callback', function(done) {
-    done.fail('an error');
+    done.fail('an error from done.fail');
   });
 
   it('should fail normal synchronous tests', function() {