From eba8c775f30a9da2f4cc47ebfdc64789216e8308 Mon Sep 17 00:00:00 2001 From: Gregg Van Hove Date: Tue, 8 Jan 2019 17:47:53 -0800 Subject: [PATCH] update npm dependencies --- package.json | 18 +++++++++--------- spec/core/matchers/toEqualSpec.js | 18 +++++------------- spec/core/matchers/toHaveClassSpec.js | 16 ++++------------ 3 files changed, 18 insertions(+), 34 deletions(-) diff --git a/package.json b/package.json index c4af4d5f..85b5218a 100644 --- a/package.json +++ b/package.json @@ -19,17 +19,17 @@ "homepage": "https://jasmine.github.io", "main": "./lib/jasmine-core.js", "devDependencies": { - "glob": "~7.1.2", - "grunt": "^1.0.1", - "grunt-cli": "^1.2.0", + "glob": "^7.1.3", + "grunt": "^1.0.3", + "grunt-cli": "^1.3.2", "grunt-contrib-compass": "^1.1.1", "grunt-contrib-compress": "^1.3.0", "grunt-contrib-concat": "^1.0.1", - "grunt-contrib-jshint": "^1.0.0", - "jasmine": "^3.0.0", - "jsdom": "^9.12.0", - "load-grunt-tasks": "^0.4.0", - "shelljs": "^0.7.0", - "temp": "~0.8.1" + "grunt-contrib-jshint": "^2.0.0", + "jasmine": "^3.3.1", + "jsdom": "^13.1.0", + "load-grunt-tasks": "^4.0.0", + "shelljs": "^0.8.3", + "temp": "^0.9.0" } } diff --git a/spec/core/matchers/toEqualSpec.js b/spec/core/matchers/toEqualSpec.js index aefaf40a..345eb724 100644 --- a/spec/core/matchers/toEqualSpec.js +++ b/spec/core/matchers/toEqualSpec.js @@ -575,23 +575,15 @@ describe("toEqual", function() { return typeof document === 'undefined' } - beforeEach(function(done) { + beforeEach(function() { this.nonBrowser = isNotRunningInBrowser(); if (this.nonBrowser) { - var jsdom = require('jsdom'); - var self = this; - jsdom.env('', function(err, win) { - if (err) { - done.fail(err); - } else { - jasmineUnderTest.getGlobal().Node = win.Node; - self.doc = win.document; - done(); - } - }); + var JSDOM = require('jsdom').JSDOM; + var dom = new JSDOM(); + jasmineUnderTest.getGlobal().Node = dom.window.Node; + this.doc = dom.window.document; } else { this.doc = document; - done(); } }); diff --git a/spec/core/matchers/toHaveClassSpec.js b/spec/core/matchers/toHaveClassSpec.js index 0537c60f..4e4ef00d 100644 --- a/spec/core/matchers/toHaveClassSpec.js +++ b/spec/core/matchers/toHaveClassSpec.js @@ -1,5 +1,5 @@ describe('toHaveClass', function() { - beforeEach(function(done) { + beforeEach(function() { this.createElementWithClassName = function(className) { var el = this.doc.createElement('div'); el.className = className; @@ -8,18 +8,10 @@ describe('toHaveClass', function() { if (typeof document !== 'undefined') { this.doc = document; - done(); } else { - var jsdom = require('jsdom'); - var self = this; - jsdom.env('', function(err, win) { - if (err) { - done.fail(err); - } else { - self.doc = win.document; - done(); - } - }); + var JSDOM = require('jsdom').JSDOM; + var dom = new JSDOM(); + this.doc = dom.window.document; } });