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

update npm dependencies

Browse Source
This commit is contained in:
Gregg Van Hove
2019-01-08 17:47:53 -08:00
parent 37dfe50d99
commit eba8c775f3
3 changed files with 18 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
package.json
+9 -9
View File
@@ -19,17 +19,17 @@
"homepage": "https://jasmine.github.io", "homepage": "https://jasmine.github.io",
"main": "./lib/jasmine-core.js", "main": "./lib/jasmine-core.js",
"devDependencies": { "devDependencies": {
"glob": "~7.1.2", "glob": "^7.1.3",
"grunt": "^1.0.1", "grunt": "^1.0.3",
"grunt-cli": "^1.2.0", "grunt-cli": "^1.3.2",
"grunt-contrib-compass": "^1.1.1", "grunt-contrib-compass": "^1.1.1",
"grunt-contrib-compress": "^1.3.0", "grunt-contrib-compress": "^1.3.0",
"grunt-contrib-concat": "^1.0.1", "grunt-contrib-concat": "^1.0.1",
"grunt-contrib-jshint": "^1.0.0", "grunt-contrib-jshint": "^2.0.0",
"jasmine": "^3.0.0", "jasmine": "^3.3.1",
"jsdom": "^9.12.0", "jsdom": "^13.1.0",
"load-grunt-tasks": "^0.4.0", "load-grunt-tasks": "^4.0.0",
"shelljs": "^0.7.0", "shelljs": "^0.8.3",
"temp": "~0.8.1" "temp": "^0.9.0"
} }
} }
spec/core/matchers/toEqualSpec.js
+5 -13
View File
@@ -575,23 +575,15 @@ describe("toEqual", function() {
return typeof document === 'undefined' return typeof document === 'undefined'
} }
beforeEach(function(done) { beforeEach(function() {
this.nonBrowser = isNotRunningInBrowser(); this.nonBrowser = isNotRunningInBrowser();
if (this.nonBrowser) { if (this.nonBrowser) {
var jsdom = require('jsdom'); var JSDOM = require('jsdom').JSDOM;
var self = this; var dom = new JSDOM();
jsdom.env('', function(err, win) { jasmineUnderTest.getGlobal().Node = dom.window.Node;
if (err) { this.doc = dom.window.document;
done.fail(err);
} else {
jasmineUnderTest.getGlobal().Node = win.Node;
self.doc = win.document;
done();
}
});
} else { } else {
this.doc = document; this.doc = document;
done();
} }
}); });
spec/core/matchers/toHaveClassSpec.js
+4 -12
View File
@@ -1,5 +1,5 @@
describe('toHaveClass', function() { describe('toHaveClass', function() {
beforeEach(function(done) { beforeEach(function() {
this.createElementWithClassName = function(className) { this.createElementWithClassName = function(className) {
var el = this.doc.createElement('div'); var el = this.doc.createElement('div');
el.className = className; el.className = className;
@@ -8,18 +8,10 @@ describe('toHaveClass', function() {
if (typeof document !== 'undefined') { if (typeof document !== 'undefined') {
this.doc = document; this.doc = document;
done();
} else { } else {
var jsdom = require('jsdom'); var JSDOM = require('jsdom').JSDOM;
var self = this; var dom = new JSDOM();
jsdom.env('', function(err, win) { this.doc = dom.window.document;
if (err) {
done.fail(err);
} else {
self.doc = win.document;
done();
}
});
} }
}); });