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

Only use the extra setTimeout outside of IE8.

Browse Source
This commit is contained in:
Gregg Van Hove
2017-08-10 16:38:13 -07:00
parent b2dee5cb1c
commit 6d0f0ed915
1 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
spec/core/integration/EnvSpec.js
View File

@@ -1117,14 +1117,18 @@ describe("Env integration", function() {
env.describe('suite', function() { env.describe('suite', function() {
env.afterAll(function() { env.afterAll(function() {
realSetTimeout(function() { if (jasmine.getEnv().ieVersion < 9) {
jasmine.clock().tick(10); } else {
}, 100); realSetTimeout(function() {
jasmine.clock().tick(10);
}, 100);
}
}); });
env.describe('beforeAll', function() { env.describe('beforeAll', function() {
env.beforeAll(function(innerDone) { env.beforeAll(function(innerDone) {
jasmine.clock().tick(5001); realSetTimeout(function() {
innerDone(); jasmine.clock().tick(5001);
}, 0);
}, 5000); }, 5000);
env.it('times out', function() {}); env.it('times out', function() {});
@@ -1132,8 +1136,9 @@ describe("Env integration", function() {
env.describe('afterAll', function() { env.describe('afterAll', function() {
env.afterAll(function(innerDone) { env.afterAll(function(innerDone) {
jasmine.clock().tick(2001); realSetTimeout(function() {
innerDone(); jasmine.clock().tick(2001);
}, 0);
}, 2000); }, 2000);
env.it('times out', function() {}); env.it('times out', function() {});
@@ -1141,8 +1146,9 @@ describe("Env integration", function() {
env.describe('beforeEach', function() { env.describe('beforeEach', function() {
env.beforeEach(function(innerDone) { env.beforeEach(function(innerDone) {
jasmine.clock().tick(1001); realSetTimeout(function() {
innerDone(); jasmine.clock().tick(1001);
}, 0);
}, 1000); }, 1000);
env.it('times out', function() {}); env.it('times out', function() {});
@@ -1150,16 +1156,18 @@ describe("Env integration", function() {
env.describe('afterEach', function() { env.describe('afterEach', function() {
env.afterEach(function(innerDone) { env.afterEach(function(innerDone) {
jasmine.clock().tick(4001); realSetTimeout(function() {
innerDone(); jasmine.clock().tick(4001);
}, 0);
}, 4000); }, 4000);
env.it('times out', function() {}); env.it('times out', function() {});
}); });
env.it('it times out', function(innerDone) { env.it('it times out', function(innerDone) {
jasmine.clock().tick(6001); realSetTimeout(function() {
innerDone(); jasmine.clock().tick(6001);
}, 0);
}, 6000); }, 6000);
}); });