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

Specs/Suites wait for an async spec to finish

Browse Source 
Go back to having all suites and specs run asynchronously so that
they properly wait for any async specs that there might be
This commit is contained in:
Sheel Choksi
2013-07-08 23:00:42 -07:00
parent ccdcb293f4
commit aabf8cec82
5 changed files with 35 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/jasmine-core/jasmine.js
View File

@@ -1323,13 +1323,10 @@ getJasmineRequireObj().QueueRunner = function() {
} }
} }
var runnerDone = iterativeIndex >= length, var runnerDone = iterativeIndex >= length;
hasBeenAsyncSpec = recursiveIndex > 0;
if (runnerDone && hasBeenAsyncSpec) { if (runnerDone) {
this.clearStack(this.onComplete); this.clearStack(this.onComplete);
} else if(runnerDone) {
this.onComplete();
} }
function attempt(fn) { function attempt(fn) {
@@ -1550,7 +1547,7 @@ getJasmineRequireObj().Suite = function() {
children = this.children_; children = this.children_;
for (var i = 0; i < children.length; i++) { for (var i = 0; i < children.length; i++) {
allFns.push(wrapChild(children[i])); allFns.push(wrapChildAsAsync(children[i]));
} }
this.onStart(this); this.onStart(this);
@@ -1568,8 +1565,8 @@ getJasmineRequireObj().Suite = function() {
} }
} }
function wrapChild(child) { function wrapChildAsAsync(child) {
return function() { child.execute(); }; return function(done) { child.execute(done); };
} }
}; };

24
spec/core/EnvSpec.js
View File

@@ -189,6 +189,30 @@ describe("Env integration", function() {
env.execute(); env.execute();
}); });
it("should run async specs in order, waiting for them to complete", function(done) {
var env = new j$.Env(), mutatedVar;
env.describe("tests", function() {
env.beforeEach(function() {
mutatedVar = 2;
});
env.it("async spec", function(underTestCallback) {
setTimeout(function() {
expect(mutatedVar).toEqual(2);
underTestCallback();
done();
}, 0);
});
env.it("after async spec", function() {
mutatedVar = 3;
});
});
env.execute();
});
// TODO: something is wrong with this spec // TODO: something is wrong with this spec
it("should report as expected", function(done) { it("should report as expected", function(done) {
var env = new j$.Env(), var env = new j$.Env(),

2
spec/core/QueueRunnerSpec.js
View File

@@ -127,7 +127,7 @@ describe("QueueRunner", function() {
expect(completeCallback).toHaveBeenCalled(); expect(completeCallback).toHaveBeenCalled();
}); });
it("with an async spec, calls a provided stack clearing function when done", function() { it("calls a provided stack clearing function when done", function() {
var asyncFn = function(done) { done() }, var asyncFn = function(done) { done() },
afterFn = jasmine.createSpy('afterFn'), afterFn = jasmine.createSpy('afterFn'),
completeCallback = jasmine.createSpy('completeCallback'), completeCallback = jasmine.createSpy('completeCallback'),

7
src/core/QueueRunner.js
View File

@@ -32,13 +32,10 @@ getJasmineRequireObj().QueueRunner = function() {
} }
} }
var runnerDone = iterativeIndex >= length, var runnerDone = iterativeIndex >= length;
hasBeenAsyncSpec = recursiveIndex > 0;
if (runnerDone && hasBeenAsyncSpec) { if (runnerDone) {
this.clearStack(this.onComplete); this.clearStack(this.onComplete);
} else if(runnerDone) {
this.onComplete();
} }
function attempt(fn) { function attempt(fn) {

6
src/core/Suite.js
View File

@@ -74,7 +74,7 @@ getJasmineRequireObj().Suite = function() {
children = this.children_; children = this.children_;
for (var i = 0; i < children.length; i++) { for (var i = 0; i < children.length; i++) {
allFns.push(wrapChild(children[i])); allFns.push(wrapChildAsAsync(children[i]));
} }
this.onStart(this); this.onStart(this);
@@ -92,8 +92,8 @@ getJasmineRequireObj().Suite = function() {
} }
} }
function wrapChild(child) { function wrapChildAsAsync(child) {
return function() { child.execute(); }; return function(done) { child.execute(done); };
} }
}; };