Skip to content

Commit

Permalink
Merge pull request #15 from ferdinandsalis/update-dependencies
Browse files Browse the repository at this point in the history
Update dependencies
  • Loading branch information
acdlite committed Nov 9, 2015
2 parents d15393b + aaf877d commit a779b13
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
10 changes: 6 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,17 +33,19 @@
"eslint": "^0.24.0",
"eslint-config-airbnb": "0.0.6",
"eslint-plugin-react": "^2.6.4",
"fbjs": "0.3.2",
"jsdom": "^5.6.0",
"mocha": "^2.2.5",
"mocha-jsdom": "^1.0.0",
"react": "^0.13.3",
"redux": "^1.0.0-rc",
"rx": "^2.5.3",
"react": "^0.14.0",
"react-addons-test-utils": "0.14.0",
"redux": "^3.0.3",
"rx": "^4.0.6",
"sinon": "^1.15.4"
},
"dependencies": {
"flux-standard-action": "^0.6.0",
"react-redux": "^0.2.2",
"react-redux": "^4.0.0",
"react-rx-component": "^0.5.0"
}
}
8 changes: 3 additions & 5 deletions src/__tests__/createConnector-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ import { Provider } from 'react-redux';
import { Observable } from 'rx';
import { funcSubject } from 'react-rx-component';
import jsdom from './jsdom';
import React from 'react/addons';
import React from 'react';
import TestUtils from 'react-addons-test-utils';

const { combineLatest } = Observable;
const { TestUtils } = React.addons;

const actionCreators = {
addTodo(text) {
Expand Down Expand Up @@ -48,9 +48,7 @@ describe('createConnector()', () => {

const tree = TestUtils.renderIntoDocument(
<Provider store={store}>
{() => (
<TodoConnector />
)}
<TodoConnector />
</Provider>
);

Expand Down
2 changes: 1 addition & 1 deletion src/__tests__/jsdom.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import ExecutionEnvironment from 'react/lib/ExecutionEnvironment';
import ExecutionEnvironment from 'fbjs/lib/ExecutionEnvironment';
import jsdom from 'mocha-jsdom';

export default function jsdomReact() {
Expand Down

0 comments on commit a779b13

Please sign in to comment.