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

Merge branch 'main' into 3.99

Browse Source
This commit is contained in:
Steve Gravrock
2021-09-06 17:39:28 -07:00
parent de9815f436 3a47a3bd04
commit 7944250290
4 changed files with 24 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -465,7 +465,7 @@ describe('Env integration', function() {
var global = {
setTimeout: function(fn, delay) {
setTimeout(fn, delay);
return setTimeout(fn, delay);
},
clearTimeout: function(fn, delay) {
clearTimeout(fn, delay);
@@ -1018,7 +1018,7 @@ describe('Env integration', function() {
var globalSetTimeout = jasmine
.createSpy('globalSetTimeout')
.and.callFake(function(cb, t) {
setTimeout(cb, t);
return setTimeout(cb, t);
}),
delayedFunctionForGlobalClock = jasmine.createSpy(
'delayedFunctionForGlobalClock'
@@ -1033,7 +1033,7 @@ describe('Env integration', function() {
setTimeout: globalSetTimeout,
clearTimeout: clearTimeout,
setImmediate: function(cb) {
setTimeout(cb, 0);
return setTimeout(cb, 0);
}
}
});
@@ -1108,7 +1108,7 @@ describe('Env integration', function() {
setInterval: setInterval,
clearInterval: clearInterval,
setImmediate: function(cb) {
realSetTimeout(cb, 0);
return realSetTimeout(cb, 0);
}
}
});
@@ -2258,7 +2258,7 @@ describe('Env integration', function() {
it('reports errors that occur during loading', function(done) {
var global = {
setTimeout: function(fn, delay) {
setTimeout(fn, delay);
return setTimeout(fn, delay);
},
clearTimeout: function(fn, delay) {
clearTimeout(fn, delay);
@@ -2315,7 +2315,7 @@ describe('Env integration', function() {
var originalOnerror = jasmine.createSpy('original onerror');
var global = {
setTimeout: function(fn, delay) {
setTimeout(fn, delay);
return setTimeout(fn, delay);
},
clearTimeout: function(fn, delay) {
clearTimeout(fn, delay);
@@ -2516,7 +2516,7 @@ describe('Env integration', function() {
it('is "failed"', function(done) {
var global = {
setTimeout: function(fn, delay) {
setTimeout(fn, delay);
return setTimeout(fn, delay);
},
clearTimeout: function(fn, delay) {
clearTimeout(fn, delay);
@@ -2774,10 +2774,6 @@ describe('Env integration', function() {
});
it('provides custom equality testers to async matchers', function(done) {
if (jasmine.getEnv().skipBrowserFlake) {
jasmine.getEnv().skipBrowserFlake();
}
jasmine.getEnv().requirePromises();
var specDone = jasmine.createSpy('specDone');