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-04-22 17:23:08 -07:00
parent 8b3a6561b1 9555cb9842
commit fb05da1fc3
24 changed files with 504 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -683,8 +683,8 @@ describe('Env integration', function() {
});
env.execute(null, function() {
// Expect >= 9 rather than >= 10 to compensate for clock imprecision
expect(duration).toBeGreaterThanOrEqual(9);
// Expect > 0 to compensate for clock imprecision
expect(duration).toBeGreaterThan(0);
done();
});
});
@@ -2886,6 +2886,8 @@ describe('Env integration', function() {
resolve = res;
});
env.configure({ random: false });
env.describe('a suite', function() {
env.it('does not wait', function() {
// Note: we intentionally don't return the result of each expectAsync.
@@ -2895,6 +2897,12 @@ describe('Env integration', function() {
});
});
env.it('another spec', function(done) {
// This is here to make sure that the async expectation evaluates
// before the Jasmine under test finishes, especially on Safari 8 and 9.
setTimeout(done, 10);
});
env.addReporter({
specDone: function() {
resolve();
@@ -2941,6 +2949,8 @@ describe('Env integration', function() {
resolve = res;
});
env.configure({ random: false });
env.describe('a suite', function() {
env.afterAll(function() {
// Note: we intentionally don't return the result of expectAsync.
@@ -2951,6 +2961,12 @@ describe('Env integration', function() {
env.it('is a spec', function() {});
});
env.it('another spec', function(done) {
// This is here to make sure that the async expectation evaluates
// before the Jasmine under test finishes, especially on Safari 8 and 9.
setTimeout(done, 10);
});
env.addReporter({
suiteDone: function() {
resolve();