From 50a52ff9f3e299b100a31b0eaf9f63bad9b35b62 Mon Sep 17 00:00:00 2001 From: Michael Giambalvo Date: Thu, 1 Sep 2016 16:19:09 -0700 Subject: [PATCH] fix(jasmine): Pass control flow to Jasminewd. Fixes #3505 and #2790, which is caused by JasmineWd and Protractor using different controlflow instances --- lib/frameworks/jasmine.js | 3 ++- package.json | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/frameworks/jasmine.js b/lib/frameworks/jasmine.js index 2670a586c..611f6da80 100644 --- 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 index 97aee97af..3c4a1e3e4 100644 --- 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",