Move explicit fail spec out of mock clock context and re-add the afterAll for IEs

This commit is contained in:
Gregg Van Hove
2018-01-29 17:05:54 -08:00
parent 46cc48ccfa
commit e908b67b19

View File

@@ -1117,11 +1117,15 @@ describe("Env integration", function() {
jasmineUnderTest.DEFAULT_TIMEOUT_INTERVAL = 10000; jasmineUnderTest.DEFAULT_TIMEOUT_INTERVAL = 10000;
env.describe('suite', function() { env.describe('suite', function() {
// env.afterAll(function() { env.afterAll(function() {
// realSetTimeout(function() { realSetTimeout(function() {
// jasmine.clock().tick(10); try {
// }, 100); jasmine.clock().tick(10);
// }); } catch(e) {
// don't worry if the clock is already uninstalled
}
}, 100);
});
env.describe('beforeAll', function() { env.describe('beforeAll', function() {
env.beforeAll(function(innerDone) { env.beforeAll(function(innerDone) {
realSetTimeout(function() { realSetTimeout(function() {
@@ -1191,17 +1195,12 @@ describe("Env integration", function() {
env.execute(); env.execute();
}); });
});
it('explicitly fails an async spec', function(done) { it('explicitly fails an async spec', function(done) {
var env = new jasmineUnderTest.Env(), var env = new jasmineUnderTest.Env(),
specDone = jasmine.createSpy('specDone'); specDone = jasmine.createSpy('specDone');
specDone.and.callFake(function() {
realSetTimeout(function() {
jasmine.clock().tick(1);
}, 0);
});
env.addReporter({ env.addReporter({
specDone: specDone, specDone: specDone,
jasmineDone: function() { jasmineDone: function() {
@@ -1221,8 +1220,7 @@ describe("Env integration", function() {
['Failed: done error'] ['Failed: done error']
); );
jasmine.clock().tick(1); setTimeout(done);
realSetTimeout(done);
} }
}); });
@@ -1232,9 +1230,6 @@ describe("Env integration", function() {
env.fail(); env.fail();
innerDone(); innerDone();
}, 1); }, 1);
jasmine.clock().tick(1);
jasmine.clock().tick(1);
jasmine.clock().tick(1);
}); });
env.it('specifies a message', function(innerDone) { env.it('specifies a message', function(innerDone) {
@@ -1242,18 +1237,12 @@ describe("Env integration", function() {
env.fail('messy message'); env.fail('messy message');
innerDone(); innerDone();
}, 1); }, 1);
jasmine.clock().tick(1);
jasmine.clock().tick(1);
jasmine.clock().tick(1);
}); });
env.it('fails via the done callback', function(innerDone) { env.it('fails via the done callback', function(innerDone) {
setTimeout(function() { setTimeout(function() {
innerDone.fail('done failed'); innerDone.fail('done failed');
}, 1); }, 1);
jasmine.clock().tick(1);
jasmine.clock().tick(1);
jasmine.clock().tick(1);
}); });
env.it('has a message from an Error', function(innerDone) { env.it('has a message from an Error', function(innerDone) {
@@ -1261,24 +1250,17 @@ describe("Env integration", function() {
env.fail(new Error('error message')); env.fail(new Error('error message'));
innerDone(); innerDone();
}, 1); }, 1);
jasmine.clock().tick(1);
jasmine.clock().tick(1);
jasmine.clock().tick(1);
}); });
env.it('has a message from an Error to done', function(innerDone) { env.it('has a message from an Error to done', function(innerDone) {
setTimeout(function() { setTimeout(function() {
innerDone(new Error('done error')); innerDone(new Error('done error'));
}, 1); }, 1);
jasmine.clock().tick(1);
jasmine.clock().tick(1);
jasmine.clock().tick(1);
}); });
}); });
env.execute(); env.execute();
}); });
});
describe('focused tests', function() { describe('focused tests', function() {
it('should only run the focused tests', function(done) { it('should only run the focused tests', function(done) {