Skip to content

Commit 6f60fc8

Browse files
committed
update tests
1 parent 5b826ab commit 6f60fc8

File tree

4 files changed

+32
-32
lines changed

4 files changed

+32
-32
lines changed

app/scripts/__tests__/header-test.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ describe('header', function() {
2121

2222
expect(itemCount).toBe(2);
2323

24-
expect(renderedItems[0].getDOMNode().textContent).toEqual('Home');
25-
expect(renderedItems[1].getDOMNode().textContent).toEqual('Info');
24+
expect(React.findDOMNode(renderedItems[0]).textContent).toEqual('Home');
25+
expect(React.findDOMNode(renderedItems[1]).textContent).toEqual('Info');
2626
});
2727

2828
});

app/scripts/__tests__/itemlist-test.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,16 @@ describe('item list', function() {
1818

1919
expect(itemCount).toBe(3);
2020

21-
expect(renderedItems[0].getDOMNode().textContent).toEqual('foo');
22-
expect(renderedItems[1].getDOMNode().textContent).toEqual('bar');
23-
expect(renderedItems[2].getDOMNode().textContent).toEqual('wut');
21+
expect(React.findDOMNode(renderedItems[0]).textContent).toEqual('foo');
22+
expect(React.findDOMNode(renderedItems[1]).textContent).toEqual('bar');
23+
expect(React.findDOMNode(renderedItems[2]).textContent).toEqual('wut');
2424
});
2525

2626
it('displays loading div', function() {
2727
var itemList = TestUtils.renderIntoDocument(<ItemList items={ [] } loading={ true } />),
2828
loadingDiv = TestUtils.findRenderedDOMComponentWithClass(itemList, 'loading-label');
2929

30-
expect(loadingDiv.getDOMNode().textContent).toEqual('Loading...');
30+
expect(React.findDOMNode(loadingDiv).textContent).toEqual('Loading...');
3131
});
3232

3333
});

app/scripts/components/header.jsx

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@ import { Link } from 'react-router';
33

44
class Header extends React.Component{
55

6+
constructor(props, context) {
7+
super(props);
8+
}
9+
610
render() {
711
return (
812
<header className="clearfix">
@@ -22,4 +26,8 @@ class Header extends React.Component{
2226

2327
}
2428

29+
Header.contextTypes = {
30+
router: React.PropTypes.func.isRequired
31+
}
32+
2533
export default Header;

test-utils/stubRouterContext.jsx

Lines changed: 18 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -2,36 +2,28 @@ var React = require('react/addons');
22
var objectAssign = require('object-assign');
33
var func = React.PropTypes.func;
44

5-
var stubRouterContext = function(Component, props, stubs){
5+
var stubRouterContext = (Component, props, stubs) => {
66
return React.createClass({
77
childContextTypes: {
8-
makePath: func,
9-
makeHref: func,
10-
transitionTo: func,
11-
replaceWith: func,
12-
goBack: func,
13-
getCurrentPath: func,
14-
getCurrentRoutes: func,
15-
getCurrentPathname: func,
16-
getCurrentParams: func,
17-
getCurrentQuery: func,
18-
isActive: func,
8+
router: React.PropTypes.object
199
},
2010

2111
getChildContext () {
22-
return objectAssign({
23-
makePath () {},
24-
makeHref () {},
25-
transitionTo () {},
26-
replaceWith () {},
27-
goBack () {},
28-
getCurrentPath () {},
29-
getCurrentRoutes () {},
30-
getCurrentPathname () {},
31-
getCurrentParams () {},
32-
getCurrentQuery () {},
33-
isActive () {},
34-
}, stubs);
12+
return {
13+
router: objectAssign({
14+
makePath () {},
15+
makeHref () {},
16+
transitionTo () {},
17+
replaceWith () {},
18+
goBack () {},
19+
getCurrentPath () {},
20+
getCurrentRoutes () {},
21+
getCurrentPathname () {},
22+
getCurrentParams () {},
23+
getCurrentQuery () {},
24+
isActive () {},
25+
}, stubs)
26+
};
3527
},
3628

3729
render () {
@@ -40,4 +32,4 @@ var stubRouterContext = function(Component, props, stubs){
4032
});
4133
};
4234

43-
module.exports = stubRouterContext;
35+
export default stubRouterContext;

0 commit comments

Comments
 (0)