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

14
Gruntfile.js
View File

@@ -40,11 +40,17 @@ module.exports = function(grunt) {
jasmine = new Jasmine({jasmineCore: jasmineCore}); jasmine = new Jasmine({jasmineCore: jasmineCore});
jasmine.loadConfigFile('./spec/support/jasmine.json'); jasmine.loadConfigFile('./spec/support/jasmine.json');
jasmine.onComplete(function(passed) {
done(passed);
});
jasmine.execute(); jasmine.exitOnCompletion = false;
jasmine.execute().then(
result => {
done(result.overallStatus === 'passed');
},
err => {
console.error(err);
exit(1);
}
);
} }
); );

2
package.json
View File

@@ -44,7 +44,7 @@
"grunt-contrib-concat": "^1.0.1", "grunt-contrib-concat": "^1.0.1",
"grunt-css-url-embed": "^1.11.1", "grunt-css-url-embed": "^1.11.1",
"grunt-sass": "^3.0.2", "grunt-sass": "^3.0.2",
"jasmine": "^3.4.0", "jasmine": "github:jasmine/jasmine-npm#main",
"jasmine-browser-runner": "github:jasmine/jasmine-browser#main", "jasmine-browser-runner": "github:jasmine/jasmine-browser#main",
"jsdom": "^15.0.0", "jsdom": "^15.0.0",
"load-grunt-tasks": "^4.0.0", "load-grunt-tasks": "^4.0.0",

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

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

10
src/html/_HTMLReporter.scss
View File

@@ -1,3 +1,5 @@
@use "sass:math";
$line-height: 14px; $line-height: 14px;
$margin-unit: 14px; $margin-unit: 14px;
@@ -117,7 +119,7 @@ body {
li { li {
display: inline-block; display: inline-block;
height: ($line-height / 2) + 3; height: math.div($line-height, 2) + 3;
width: $line-height; width: $line-height;
font-size: 16px; font-size: 16px;
@@ -132,7 +134,7 @@ body {
} }
&.jasmine-failed { &.jasmine-failed {
line-height: ($line-height / 2) + 2; line-height: math.div($line-height, 2) + 2;
&:before { &:before {
color: $failing-color; color: $failing-color;
@@ -284,8 +286,8 @@ body {
padding-left: 0; padding-left: 0;
&.jasmine-suite { &.jasmine-suite {
margin-top: $margin-unit/2; margin-top: math.div($margin-unit, 2);
margin-bottom: $margin-unit/2 margin-bottom: math.div($margin-unit, 2)
} }
} }