Skip to content

Commit f4d86a2

Browse files
committed
Update to React 0.14-rc1
1 parent c5c4f10 commit f4d86a2

File tree

3 files changed

+13
-20
lines changed

3 files changed

+13
-20
lines changed

package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,11 @@
3737
"mocha": "^2.2.5",
3838
"mocha-jsdom": "^1.0.0",
3939
"node-libs-browser": "^0.5.2",
40-
"react": "0.13.x",
40+
"react": "0.14.0-rc1",
41+
"react-addons-test-utils": "^0.14.0-rc1",
4142
"react-redux": "2.x",
4243
"react-router": "1.0.0-rc1",
43-
"redux": "2.x",
44+
"redux": "3.x",
4445
"redux-devtools": "^2.1.0",
4546
"rimraf": "^2.4.3",
4647
"sinon": "^1.15.4",

src/__tests__/ReduxRouter-test.js

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,18 @@ import {
44
routerStateReducer
55
} from '../';
66

7-
import React, { Component, PropTypes } from 'react/addons';
8-
import { Provider, connect } from 'react-redux';
9-
import { createStore, combineReducers } from 'redux';
10-
import createHistory from 'history/lib/createMemoryHistory';
11-
import { Link, Route } from 'react-router';
12-
import jsdom from './jsdom';
13-
14-
const {
7+
import React, { Component, PropTypes } from 'react';
8+
import {
159
renderIntoDocument,
1610
findRenderedComponentWithType,
1711
findRenderedDOMComponentWithTag,
1812
Simulate
19-
} = React.addons.TestUtils;
13+
} from 'react-addons-test-utils';
14+
import { Provider, connect } from 'react-redux';
15+
import { createStore, combineReducers } from 'redux';
16+
import createHistory from 'history/lib/createMemoryHistory';
17+
import { Link, Route } from 'react-router';
18+
import jsdom from 'mocha-jsdom';
2019

2120
@connect(state => state.router)
2221
class App extends Component {
@@ -78,9 +77,9 @@ describe('<ReduxRouter>', () => {
7877
history.pushState(null, '/parent/child/123?key=value');
7978

8079
return renderIntoDocument(
81-
<Provider store={store}>{() =>
80+
<Provider store={store}>
8281
<ReduxRouter />
83-
}</Provider>
82+
</Provider>
8483
);
8584
}
8685

src/__tests__/jsdom.js

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)