Skip to content

Commit

Permalink
Merge pull request #12 from plougsgaard/greenkeeper/jsdom-10.1.0
Browse files Browse the repository at this point in the history
Greenkeeper/jsdom 10.1.0
  • Loading branch information
plougsgaard committed May 1, 2017
2 parents fd39ec7 + c89cff1 commit 731d9cf
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
language: node_js
node_js:
- '4.0'
- '6.6.0'
sudo: false
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"chai": "^3.4.1",
"chai-immutable": "^1.5.3",
"immutable": "^3.8.0",
"jsdom": "^9.11.0",
"jsdom": "^10.1.0",
"mocha": "^3.2.0",
"react": "^15.4.2",
"react-addons-test-utils": "^15.4.2",
Expand Down
10 changes: 5 additions & 5 deletions test/helper.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import jsdom from 'jsdom'
import { JSDOM } from 'jsdom'
import chai from 'chai'
import chaiImmutable from 'chai-immutable'

const doc = jsdom.jsdom('<!doctype html><html><body></body></html>')
const win = doc.defaultView
const { window } = new JSDOM('<!doctype html><html><body></body></html>')
const { document } = window

global.document = doc
global.window = win
global.document = document
global.window = window

Object.keys(window).forEach((key) => {
if (!(key in global)) {
Expand Down

0 comments on commit 731d9cf

Please sign in to comment.