fix(jasmine): Pass control flow to Jasminewd (#3519)

Fixes #3505 and #2790, which is caused by JasmineWd and Protractor using different controlflow instances
angular · Sep 7, 2016 · c7fff5e · c7fff5e
1 parent 64b4910
commit c7fff5e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/lib/frameworks/jasmine.js b/lib/frameworks/jasmine.js
@@ -1,4 +1,5 @@
 var q = require('q');
+var webdriver = require('selenium-webdriver');
 
 var RunnerReporter = function(emitter) {
   this.emitter = emitter;
@@ -62,7 +63,7 @@ exports.run = function(runner, specs) {
   var jrunner = new JasmineRunner();
   /* global jasmine */
 
-  require('jasminewd2');
+  require('jasminewd2').init(webdriver.promise.controlFlow());
 
   var jasmineNodeOpts = runner.getConfig().jasmineNodeOpts;
 

diff --git a/package.json b/package.json
@@ -18,7 +18,7 @@
     "chalk": "^1.1.3",
     "glob": "^7.0.3",
     "jasmine": "2.4.1",
-    "jasminewd2": "0.0.9",
+    "jasminewd2": "0.0.10",
     "optimist": "~0.6.0",
     "q": "1.4.1",
     "saucelabs": "~1.3.0",