Pass queue runner factory to Spec#execute, not ctor
This commit is contained in:
@@ -374,7 +374,7 @@ getJasmineRequireObj().Env = function(j$) {
|
||||
deprecator.addDeprecationWarning(runable, deprecation, options);
|
||||
};
|
||||
|
||||
function queueRunnerFactory(options, args) {
|
||||
function queueRunnerFactory(options) {
|
||||
if (options.isLeaf) {
|
||||
// A spec
|
||||
options.SkipPolicy = j$.CompleteOnFirstErrorSkipPolicy;
|
||||
@@ -404,7 +404,7 @@ getJasmineRequireObj().Env = function(j$) {
|
||||
};
|
||||
options.deprecated = self.deprecated;
|
||||
|
||||
new j$.QueueRunner(options).execute(args);
|
||||
new j$.QueueRunner(options).execute();
|
||||
}
|
||||
|
||||
const suiteBuilder = new j$.SuiteBuilder({
|
||||
|
||||
@@ -25,7 +25,6 @@ getJasmineRequireObj().Spec = function(j$) {
|
||||
return '';
|
||||
};
|
||||
this.onLateError = attrs.onLateError || function() {};
|
||||
this.queueRunnerFactory = attrs.queueRunnerFactory || function() {};
|
||||
this.catchingExceptions =
|
||||
attrs.catchingExceptions ||
|
||||
function() {
|
||||
@@ -99,7 +98,12 @@ getJasmineRequireObj().Spec = function(j$) {
|
||||
return this.asyncExpectationFactory(actual, this);
|
||||
};
|
||||
|
||||
Spec.prototype.execute = function(onComplete, excluded, failSpecWithNoExp) {
|
||||
Spec.prototype.execute = function(
|
||||
queueRunnerFactory,
|
||||
onComplete,
|
||||
excluded,
|
||||
failSpecWithNoExp
|
||||
) {
|
||||
const onStart = {
|
||||
fn: done => {
|
||||
this.timer.start();
|
||||
@@ -161,7 +165,7 @@ getJasmineRequireObj().Spec = function(j$) {
|
||||
runnerConfig.queueableFns.unshift(onStart);
|
||||
runnerConfig.queueableFns.push(complete);
|
||||
|
||||
this.queueRunnerFactory(runnerConfig);
|
||||
queueRunnerFactory(runnerConfig);
|
||||
};
|
||||
|
||||
Spec.prototype.reset = function() {
|
||||
|
||||
@@ -12,7 +12,6 @@ getJasmineRequireObj().SuiteBuilder = function(j$) {
|
||||
this.onLateError_ = options.onLateError;
|
||||
this.specResultCallback_ = options.specResultCallback;
|
||||
this.specStarted_ = options.specStarted;
|
||||
this.queueRunnerFactory_ = options.queueRunnerFactory;
|
||||
|
||||
this.nextSuiteId_ = 0;
|
||||
this.nextSpecId_ = 0;
|
||||
@@ -212,7 +211,6 @@ getJasmineRequireObj().SuiteBuilder = function(j$) {
|
||||
},
|
||||
onStart: (spec, next) => this.specStarted_(spec, suite, next),
|
||||
description: description,
|
||||
queueRunnerFactory: this.queueRunnerFactory_,
|
||||
userContext: function() {
|
||||
return suite.clonedSharedUserContext();
|
||||
},
|
||||
|
||||
@@ -230,6 +230,7 @@ getJasmineRequireObj().TreeProcessor = function() {
|
||||
return {
|
||||
fn: function(done) {
|
||||
node.execute(
|
||||
queueRunnerFactory,
|
||||
done,
|
||||
stats[node.id].excluded,
|
||||
failSpecWithNoExpectations
|
||||
|
||||
Reference in New Issue
Block a user