Rename queueRunnerFactory to runQueue throughout
This commit is contained in:
@@ -455,7 +455,7 @@ getJasmineRequireObj().Env = function(j$) {
|
||||
deprecator.addDeprecationWarning(runable, deprecation, options);
|
||||
};
|
||||
|
||||
function queueRunnerFactory(options) {
|
||||
function runQueue(options) {
|
||||
options.clearStack = options.clearStack || clearStack;
|
||||
options.timeout = {
|
||||
setTimeout: realSetTimeout,
|
||||
@@ -479,7 +479,7 @@ getJasmineRequireObj().Env = function(j$) {
|
||||
onLateError: recordLateError,
|
||||
specResultCallback,
|
||||
specStarted,
|
||||
queueRunnerFactory
|
||||
runQueue
|
||||
});
|
||||
topSuite = suiteBuilder.topSuite;
|
||||
const deprecator = new j$.Deprecator(topSuite);
|
||||
@@ -506,7 +506,7 @@ getJasmineRequireObj().Env = function(j$) {
|
||||
j$.reporterEvents,
|
||||
function(options) {
|
||||
options.SkipPolicy = j$.NeverSkipPolicy;
|
||||
return queueRunnerFactory(options);
|
||||
return runQueue(options);
|
||||
},
|
||||
recordLateError
|
||||
);
|
||||
@@ -517,7 +517,7 @@ getJasmineRequireObj().Env = function(j$) {
|
||||
focusedRunables: () => suiteBuilder.focusedRunables,
|
||||
runableResources,
|
||||
reporter,
|
||||
queueRunnerFactory,
|
||||
runQueue,
|
||||
TreeProcessor: j$.TreeProcessor,
|
||||
globalErrors,
|
||||
getConfig: () => config,
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
getJasmineRequireObj().ReportDispatcher = function(j$) {
|
||||
'use strict';
|
||||
|
||||
function ReportDispatcher(methods, queueRunnerFactory, onLateError) {
|
||||
function ReportDispatcher(methods, runQueue, onLateError) {
|
||||
const dispatchedMethods = methods || [];
|
||||
|
||||
for (const method of dispatchedMethods) {
|
||||
@@ -39,7 +39,7 @@ getJasmineRequireObj().ReportDispatcher = function(j$) {
|
||||
}
|
||||
|
||||
return new Promise(function(resolve) {
|
||||
queueRunnerFactory({
|
||||
runQueue({
|
||||
queueableFns: fns,
|
||||
onComplete: resolve,
|
||||
isReporter: true,
|
||||
|
||||
@@ -6,7 +6,7 @@ getJasmineRequireObj().Runner = function(j$) {
|
||||
this.totalSpecsDefined_ = options.totalSpecsDefined;
|
||||
this.focusedRunables_ = options.focusedRunables;
|
||||
this.runableResources_ = options.runableResources;
|
||||
this.queueRunnerFactory_ = options.queueRunnerFactory;
|
||||
this.runQueue_ = options.runQueue;
|
||||
this.TreeProcessor_ = options.TreeProcessor;
|
||||
this.globalErrors_ = options.globalErrors;
|
||||
this.reporter_ = options.reporter;
|
||||
@@ -59,7 +59,7 @@ getJasmineRequireObj().Runner = function(j$) {
|
||||
const processor = new this.TreeProcessor_({
|
||||
tree: this.topSuite_,
|
||||
runnableIds: runablesToRun,
|
||||
queueRunnerFactory: options => {
|
||||
runQueue: options => {
|
||||
if (options.isLeaf) {
|
||||
// A spec
|
||||
options.SkipPolicy = j$.CompleteOnFirstErrorSkipPolicy;
|
||||
@@ -72,7 +72,7 @@ getJasmineRequireObj().Runner = function(j$) {
|
||||
}
|
||||
}
|
||||
|
||||
return this.queueRunnerFactory_(options);
|
||||
return this.runQueue_(options);
|
||||
},
|
||||
globalErrors: this.globalErrors_,
|
||||
failSpecWithNoExpectations: config.failSpecWithNoExpectations,
|
||||
|
||||
@@ -72,7 +72,7 @@ getJasmineRequireObj().Spec = function(j$) {
|
||||
};
|
||||
|
||||
Spec.prototype.execute = function(
|
||||
queueRunnerFactory,
|
||||
runQueue,
|
||||
globalErrors,
|
||||
onComplete,
|
||||
excluded,
|
||||
@@ -155,7 +155,7 @@ getJasmineRequireObj().Spec = function(j$) {
|
||||
}
|
||||
runnerConfig.queueableFns.push(complete);
|
||||
|
||||
queueRunnerFactory(runnerConfig);
|
||||
runQueue(runnerConfig);
|
||||
};
|
||||
|
||||
Spec.prototype.reset = function() {
|
||||
|
||||
@@ -2,7 +2,7 @@ getJasmineRequireObj().TreeProcessor = function() {
|
||||
function TreeProcessor(attrs) {
|
||||
const tree = attrs.tree;
|
||||
const runnableIds = attrs.runnableIds;
|
||||
const queueRunnerFactory = attrs.queueRunnerFactory;
|
||||
const runQueue = attrs.runQueue;
|
||||
const nodeStart = attrs.nodeStart || function() {};
|
||||
const nodeComplete = attrs.nodeComplete || function() {};
|
||||
const failSpecWithNoExpectations = !!attrs.failSpecWithNoExpectations;
|
||||
@@ -42,7 +42,7 @@ getJasmineRequireObj().TreeProcessor = function() {
|
||||
const childFns = wrapChildren(tree, 0);
|
||||
|
||||
await new Promise(function(resolve) {
|
||||
queueRunnerFactory({
|
||||
runQueue({
|
||||
queueableFns: childFns,
|
||||
userContext: tree.sharedUserContext(),
|
||||
onException: function() {
|
||||
@@ -212,7 +212,7 @@ getJasmineRequireObj().TreeProcessor = function() {
|
||||
}
|
||||
};
|
||||
|
||||
queueRunnerFactory({
|
||||
runQueue({
|
||||
onComplete: function() {
|
||||
const args = Array.prototype.slice.call(arguments, [0]);
|
||||
node.cleanupBeforeAfter();
|
||||
@@ -235,7 +235,7 @@ getJasmineRequireObj().TreeProcessor = function() {
|
||||
return {
|
||||
fn: function(done) {
|
||||
node.execute(
|
||||
queueRunnerFactory,
|
||||
runQueue,
|
||||
globalErrors,
|
||||
done,
|
||||
stats[node.id].excluded,
|
||||
|
||||
Reference in New Issue
Block a user