diff --git a/spec/core/SpecSpec.js b/spec/core/SpecSpec.js index 54ea330f..a3515483 100644 --- a/spec/core/SpecSpec.js +++ b/spec/core/SpecSpec.js @@ -26,7 +26,7 @@ describe("Spec", function() { description: 'my test', id: 'some-id', fn: function() {}, - queueRunner: fakeQueueRunner + queueRunnerFactory: fakeQueueRunner }); spec.execute(); @@ -42,7 +42,7 @@ describe("Spec", function() { description: 'foo bar', fn: function() {}, onStart: startCallback, - queueRunner: fakeQueueRunner + queueRunnerFactory: fakeQueueRunner }); spec.execute(); @@ -69,7 +69,7 @@ describe("Spec", function() { }] }, onStart: startCallback, - queueRunner: fakeQueueRunner + queueRunnerFactory: fakeQueueRunner }); spec.execute(); @@ -93,7 +93,7 @@ describe("Spec", function() { afterFns: function() { return [after] }, - queueRunner: fakeQueueRunner + queueRunnerFactory: fakeQueueRunner }); spec.execute(); @@ -111,7 +111,7 @@ describe("Spec", function() { onStart: startCallback, fn: null, resultCallback: resultCallback, - queueRunner: fakeQueueRunner + queueRunnerFactory: fakeQueueRunner }); @@ -127,7 +127,7 @@ describe("Spec", function() { onStart:startCallback, fn: specBody, resultCallback: resultCallback, - queueRunner: fakeQueueRunner + queueRunnerFactory: fakeQueueRunner }); spec.disable(); @@ -154,7 +154,7 @@ describe("Spec", function() { getSpecName: function() { return "a suite with a spec" }, - queueRunner: fakeQueueRunner + queueRunnerFactory: fakeQueueRunner }); spec.pend(); @@ -181,7 +181,7 @@ describe("Spec", function() { fn: function() {}, catchExceptions: function() { return false; }, resultCallback: function() {}, - queueRunner: function(attrs) { attrs.onComplete(); } + queueRunnerFactory: function(attrs) { attrs.onComplete(); } }); spec.execute(done); @@ -265,7 +265,7 @@ describe("Spec", function() { description: 'my test', id: 'some-id', fn: function() { }, - queueRunner: fakeQueueRunner + queueRunnerFactory: fakeQueueRunner }); spec.execute(); diff --git a/src/core/Env.js b/src/core/Env.js index 8825f055..61b49668 100644 --- a/src/core/Env.js +++ b/src/core/Env.js @@ -270,7 +270,7 @@ getJasmineRequireObj().Env = function(j$) { onStart: specStarted, description: description, expectationResultFactory: expectationResultFactory, - queueRunner: queueRunnerFactory, + queueRunnerFactory: queueRunnerFactory, fn: fn, timer: {setTimeout: realSetTimeout, clearTimeout: realClearTimeout} }); diff --git a/src/core/Spec.js b/src/core/Spec.js index 8c51b946..afdebd41 100644 --- a/src/core/Spec.js +++ b/src/core/Spec.js @@ -12,7 +12,7 @@ getJasmineRequireObj().Spec = function(j$) { this.exceptionFormatter = attrs.exceptionFormatter || function() {}; this.getSpecName = attrs.getSpecName || function() { return ''; }; this.expectationResultFactory = attrs.expectationResultFactory || function() { }; - this.queueRunner = attrs.queueRunner || function() {}; + this.queueRunnerFactory = attrs.queueRunnerFactory || function() {}; this.catchingExceptions = attrs.catchingExceptions || function() { return true; }; 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; var allFns = befores.concat(thisOne).concat(afters); - this.queueRunner({ + this.queueRunnerFactory({ fns: allFns, onException: onException, onComplete: complete