Skip to content

Commit 3eecf34

Browse files
committed
Update deps and fix phantomjs errors in test
1 parent 27c00d3 commit 3eecf34

File tree

2 files changed

+18
-12
lines changed

2 files changed

+18
-12
lines changed

karma.conf.js

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module.exports = function(config) {
33

44
basePath: '',
55

6-
frameworks: ['jasmine'],
6+
frameworks: ['phantomjs-shim', 'jasmine'],
77

88
files: [
99
'specs/main.js'
@@ -49,15 +49,17 @@ module.exports = function(config) {
4949

5050
autoWatch: false,
5151

52-
browsers: ['PhantomJS', 'Firefox'],
52+
browsers: ['PhantomJS', 'Firefox', 'Chrome'],
5353

5454
singleRun: false,
5555

5656
plugins: [
5757
require('karma-jasmine'),
5858
require('karma-phantomjs-launcher'),
5959
require('karma-firefox-launcher'),
60-
require('karma-webpack')
60+
require('karma-chrome-launcher'),
61+
require('karma-webpack'),
62+
require('karma-phantomjs-shim')
6163
]
6264
});
6365
};

package.json

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,34 +25,38 @@
2525
},
2626
"homepage": "https://github.com/mzabriskie/react-draggable",
2727
"devDependencies": {
28-
"babel-core": "^5.8.25",
28+
"babel-core": "^5.8.29",
2929
"babel-eslint": "^4.1.3",
3030
"babel-loader": "^5.3.2",
31-
"eslint": "^1.5.1",
32-
"eslint-plugin-react": "^3.4.2",
33-
"karma": "^0.13.10",
31+
"babel-plugin-typecheck": "^1.3.0",
32+
"eslint": "^1.7.3",
33+
"eslint-plugin-react": "^3.6.3",
34+
"karma": "^0.13.14",
35+
"karma-chrome-launcher": "^0.2.1",
3436
"karma-cli": "0.1.1",
3537
"karma-firefox-launcher": "^0.1.6",
3638
"karma-jasmine": "^0.3.6",
3739
"karma-phantomjs-launcher": "^0.2.1",
40+
"karma-phantomjs-shim": "^1.1.1",
3841
"karma-webpack": "^1.7.0",
3942
"lodash": "^3.10.1",
4043
"open": "0.0.5",
4144
"phantomjs": "^1.9.18",
42-
"pre-commit": "^1.1.1",
43-
"react": "^0.13.3",
45+
"pre-commit": "^1.1.2",
46+
"react": "^0.14.0",
47+
"react-dom": "^0.14.0",
4448
"semver": "^5.0.3",
4549
"static-server": "^2.0.0",
46-
"uglify-js": "^2.4.24",
50+
"uglify-js": "^2.5.0",
4751
"webpack": "^1.12.2",
48-
"webpack-dev-server": "^1.12.0"
52+
"webpack-dev-server": "^1.12.1"
4953
},
5054
"precommit": [
5155
"lint",
5256
"test"
5357
],
5458
"dependencies": {
55-
"classnames": "^2.1.3",
59+
"classnames": "^2.2.0",
5660
"object-assign": "^4.0.1"
5761
}
5862
}

0 commit comments

Comments
 (0)