admin/jasmine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename Spec's queueRunner to more accurately be a queueRunnerFactory

Browse Source
This commit is contained in:
Sheel Choksi
2013-11-10 12:52:25 -08:00
parent 916f889c01
commit 614a18453e
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
spec/core/SpecSpec.js
View File

@@ -26,7 +26,7 @@ describe("Spec", function() {
description: 'my test', description: 'my test',
id: 'some-id', id: 'some-id',
fn: function() {}, fn: function() {},
queueRunner: fakeQueueRunner queueRunnerFactory: fakeQueueRunner
}); });
spec.execute(); spec.execute();
@@ -42,7 +42,7 @@ describe("Spec", function() {
description: 'foo bar', description: 'foo bar',
fn: function() {}, fn: function() {},
onStart: startCallback, onStart: startCallback,
queueRunner: fakeQueueRunner queueRunnerFactory: fakeQueueRunner
}); });
spec.execute(); spec.execute();
@@ -69,7 +69,7 @@ describe("Spec", function() {
}] }]
}, },
onStart: startCallback, onStart: startCallback,
queueRunner: fakeQueueRunner queueRunnerFactory: fakeQueueRunner
}); });
spec.execute(); spec.execute();
@@ -93,7 +93,7 @@ describe("Spec", function() {
afterFns: function() { afterFns: function() {
return [after] return [after]
}, },
queueRunner: fakeQueueRunner queueRunnerFactory: fakeQueueRunner
}); });
spec.execute(); spec.execute();
@@ -111,7 +111,7 @@ describe("Spec", function() {
onStart: startCallback, onStart: startCallback,
fn: null, fn: null,
resultCallback: resultCallback, resultCallback: resultCallback,
queueRunner: fakeQueueRunner queueRunnerFactory: fakeQueueRunner
}); });
@@ -127,7 +127,7 @@ describe("Spec", function() {
onStart:startCallback, onStart:startCallback,
fn: specBody, fn: specBody,
resultCallback: resultCallback, resultCallback: resultCallback,
queueRunner: fakeQueueRunner queueRunnerFactory: fakeQueueRunner
}); });
spec.disable(); spec.disable();
@@ -154,7 +154,7 @@ describe("Spec", function() {
getSpecName: function() { getSpecName: function() {
return "a suite with a spec" return "a suite with a spec"
}, },
queueRunner: fakeQueueRunner queueRunnerFactory: fakeQueueRunner
}); });
spec.pend(); spec.pend();
@@ -181,7 +181,7 @@ describe("Spec", function() {
fn: function() {}, fn: function() {},
catchExceptions: function() { return false; }, catchExceptions: function() { return false; },
resultCallback: function() {}, resultCallback: function() {},
queueRunner: function(attrs) { attrs.onComplete(); } queueRunnerFactory: function(attrs) { attrs.onComplete(); }
}); });
spec.execute(done); spec.execute(done);
@@ -265,7 +265,7 @@ describe("Spec", function() {
description: 'my test', description: 'my test',
id: 'some-id', id: 'some-id',
fn: function() { }, fn: function() { },
queueRunner: fakeQueueRunner queueRunnerFactory: fakeQueueRunner
}); });
spec.execute(); spec.execute();

2
src/core/Env.js
View File

@@ -270,7 +270,7 @@ getJasmineRequireObj().Env = function(j$) {
onStart: specStarted, onStart: specStarted,
description: description, description: description,
expectationResultFactory: expectationResultFactory, expectationResultFactory: expectationResultFactory,
queueRunner: queueRunnerFactory, queueRunnerFactory: queueRunnerFactory,
fn: fn, fn: fn,
timer: {setTimeout: realSetTimeout, clearTimeout: realClearTimeout} timer: {setTimeout: realSetTimeout, clearTimeout: realClearTimeout}
}); });

4
src/core/Spec.js
View File

@@ -12,7 +12,7 @@ getJasmineRequireObj().Spec = function(j$) {
this.exceptionFormatter = attrs.exceptionFormatter || function() {}; this.exceptionFormatter = attrs.exceptionFormatter || function() {};
this.getSpecName = attrs.getSpecName || function() { return ''; }; this.getSpecName = attrs.getSpecName || function() { return ''; };
this.expectationResultFactory = attrs.expectationResultFactory || function() { }; this.expectationResultFactory = attrs.expectationResultFactory || function() { };
this.queueRunner = attrs.queueRunner || function() {}; this.queueRunnerFactory = attrs.queueRunnerFactory || function() {};
this.catchingExceptions = attrs.catchingExceptions || function() { return true; }; this.catchingExceptions = attrs.catchingExceptions || function() { return true; };
this.timer = attrs.timer || {setTimeout: setTimeout, clearTimeout: clearTimeout}; this.timer = attrs.timer || {setTimeout: setTimeout, clearTimeout: clearTimeout};
@@ -77,7 +77,7 @@ getJasmineRequireObj().Spec = function(j$) {
thisOne = (this.fn.length) ? timeoutable(this.fn) : this.fn; thisOne = (this.fn.length) ? timeoutable(this.fn) : this.fn;
var allFns = befores.concat(thisOne).concat(afters); var allFns = befores.concat(thisOne).concat(afters);
this.queueRunner({ this.queueRunnerFactory({
fns: allFns, fns: allFns,
onException: onException, onException: onException,
onComplete: complete onComplete: complete