Skip to content

Commit

Permalink
update dependencies and fix tests
Browse files Browse the repository at this point in the history
  • Loading branch information
Dan Delany committed Aug 8, 2017
1 parent 2e25daf commit 5b30323
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 22 deletions.
29 changes: 14 additions & 15 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
"lib/",
"src/"
],
"engines": {
"node": ">=4.0.0"
},
"scripts": {
"dev": "webpack-dev-server --config webpack.config.base.js",
"build-lib": "rm -rf lib/ && babel src --out-dir lib --source-maps",
Expand All @@ -22,14 +25,12 @@
"dependencies": {
"d3": "^4.4.0",
"invariant": "^2.2.0",
"jquery": "^2.1.4",
"lodash": "^4.5.1",
"measure-text": "0.0.4",
"moment": "^2.10.6",
"numeral": "^1.5.3",
"prop-types": "^15.5.10",
"react-addons-shallow-compare": "^15.6.0",
"recompose": "^0.15.1"
"react-addons-shallow-compare": "^15.6.0"
},
"peerDependencies": {
"react": ">=0.14.0, <0.16.0",
Expand All @@ -38,40 +39,38 @@
"devDependencies": {
"babel-cli": "^6.6.0",
"babel-core": "^6.6.0",
"babel-loader": "^6.2.4",
"babel-loader": "^7.1.1",
"babel-plugin-transform-class-properties": "^6.6.0",
"babel-plugin-transform-object-rest-spread": "^6.6.5",
"babel-preset-es2015": "^6.6.0",
"babel-preset-react": "^6.5.0",
"babel-register": "^6.7.2",
"chai": "^3.4.0",
"chai-enzyme": "^0.4.1",
"chai": "^4.1.1",
"chai-enzyme": "^0.8.0",
"clean-webpack-plugin": "^0.1.16",
"component-playground": "^1.3.2",
"copy-webpack-plugin": "^4.0.1",
"css-loader": "^0.15.6",
"css-loader": "^0.28.4",
"enzyme": "^2.9.1",
"html-webpack-plugin": "^2.30.1",
"jsdom": "^9.8.0",
"jsdom": "^9.12.0",
"json-loader": "^0.5.2",
"less": "^2.5.1",
"less-loader": "^2.2.0",
"mocha": "^2.3.3",
"mocha-phantomjs": "^4.0.1",
"less-loader": "^4.0.5",
"mocha": "^3.5.0",
"raw-loader": "^0.5.1",
"react": "^15.6.1",
"react-addons-test-utils": "^15.6.0",
"react-addons-update": "^15.6.0",
"react-dom": "^15.6.1",
"react-pure-render-debug": "^1.1.1",
"react-router": "^4.1.2",
"react-router-dom": "^4.1.2",
"shelljs": "^0.7.8",
"style-loader": "^0.12.3",
"style-loader": "^0.18.2",
"webpack": "^3.4.1",
"webpack-dev-server": "^2.6.1"
"webpack-dev-server": "^2.7.1"
},
"license": "Apache 2.0",
"license": "Apache-2.0",
"repository": {
"type": "git",
"url": "https://github.com/spotify/reactochart"
Expand Down
4 changes: 4 additions & 0 deletions tests/jsdom/setup.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,7 @@ Object.keys(document.defaultView).forEach((property) => {
global.navigator = {
userAgent: 'node.js'
};

// hack to deal with https://github.com/airbnb/enzyme/issues/888
// see also https://github.com/chaijs/type-detect/issues/98
global.HTMLElement = window.HTMLElement;
9 changes: 2 additions & 7 deletions tests/jsdom/spec/resolveXYScales.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,7 @@ describe('resolveXYScales', () => {
const wrapped = mount(<XYChart {...props} />);
const rendered = wrapped.find(Chart);
const renderedScale = rendered.props().scale;

expectXYScales(renderedScale);
expect(renderedScale.x.domain()).to.deep.equal(props.domain.x);
expect(renderedScale.y.domain()).to.deep.equal(props.domain.y);
Expand Down Expand Up @@ -364,13 +365,7 @@ describe('resolveXYScales', () => {
</XYContainerChartWithObjectProps>;
const wrapped = mount(tree);
const rendered = wrapped.find(ContainerChart);
//
// expectXYScaledComponent(rendered, {
// ...containerProps,
// margin: customMargin,
// scaleType: {x: 'linear', y: 'linear'},
// domain: {x: [-12, 12], y: [-12, 12]}
// });

expect(rendered.props().margin).to.deep.equal(customMargin);
expect(rendered.props().scaleType).to.deep.equal({x: 'linear', y: 'linear'});
expect(rendered.props().domain.x).to.deep.equal([-12, 12]);
Expand Down

0 comments on commit 5b30323

Please sign in to comment.