Merge branch 'fix-travis' into graphical-tests

motiz88 · motiz88 · commit af832ab80271 · 2016-04-13T19:54:09.000+03:00
# Conflicts:
#	package.json
diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,8 @@
 language: node_js
+before_install: npm install -g npm@3
 script: travis_retry npm test
 node_js:
 - '0.12'
+- '4'
+- '5'
 sudo: false
diff --git a/__tests__/Sparklines.js b/__tests__/Sparklines.js
@@ -3,10 +3,6 @@ import ReactDOM from 'react-dom';
 import { shallow } from 'enzyme';
 import { expect } from 'chai';
 import { Sparklines } from '../src/Sparklines';
-import jsdom from 'jsdom'
-
-global.document = jsdom.jsdom('<!doctype html><html><body></body></html>');
-global.window = document.parentWindow;
 
 describe('Sparklines', () => {
     it('does not throw without any parameters', () => {
diff --git a/package.json b/package.json
@@ -44,11 +44,12 @@
     "chai": "^3.5.0",
     "enzyme": "^2.1.0",
     "hiff": "^0.3.0",
-    "jsdom": "^8.1.0",
     "line-by-line": "^0.1.4",
     "mocha": "^2.4.5",
     "react-addons-test-utils": "^0.14.7",
+    "react": "^0.14.7",
     "react-element-to-jsx-string": "=2.5.0",
+    "react-dom": "^0.14.7",
     "replaceall": "^0.1.6",
     "webpack": "^2.1.0-beta.4",
     "webpack-dev-server": "^2.0.0-beta"
