Skip to content
This repository was archived by the owner on Jul 29, 2024. It is now read-only.

Commit c7fff5e

Browse files
authored
fix(jasmine): Pass control flow to Jasminewd (#3519)
Fixes #3505 and #2790, which is caused by JasmineWd and Protractor using different controlflow instances
1 parent 64b4910 commit c7fff5e

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

lib/frameworks/jasmine.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
var q = require('q');
2+
var webdriver = require('selenium-webdriver');
23

34
var RunnerReporter = function(emitter) {
45
this.emitter = emitter;
@@ -62,7 +63,7 @@ exports.run = function(runner, specs) {
6263
var jrunner = new JasmineRunner();
6364
/* global jasmine */
6465

65-
require('jasminewd2');
66+
require('jasminewd2').init(webdriver.promise.controlFlow());
6667

6768
var jasmineNodeOpts = runner.getConfig().jasmineNodeOpts;
6869

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"chalk": "^1.1.3",
1919
"glob": "^7.0.3",
2020
"jasmine": "2.4.1",
21-
"jasminewd2": "0.0.9",
21+
"jasminewd2": "0.0.10",
2222
"optimist": "~0.6.0",
2323
"q": "1.4.1",
2424
"saucelabs": "~1.3.0",

0 commit comments

Comments
 (0)