Skip to content

Commit 016eb9d

Browse files
committed
Update visual tests to use react-router-dom
1 parent 593b055 commit 016eb9d

File tree

6 files changed

+19
-30
lines changed

6 files changed

+19
-30
lines changed

test/visual/ButtonVisual.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
import React from 'react';
22
import ButtonToolbar from 'react-bootstrap/lib/ButtonToolbar';
33
import Button from 'react-bootstrap/lib/Button';
4-
import { Link } from 'react-router';
4+
import { Link } from 'react-router-dom';
55

66
import LinkContainer from '../../src/LinkContainer';
77

88
export default () => (
99
<div>
10-
<Link to="home">Back to Index</Link>
10+
<Link to="/home">Back to Index</Link>
1111
<h2>Button</h2>
1212

1313
<h3>Baseline</h3>

test/visual/Home.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React from 'react';
2-
import { Link } from 'react-router';
2+
import { Link } from 'react-router-dom';
33

44
export default () => (
55
<div>

test/visual/ListGroupItemVisual.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import React from 'react';
22
import ListGroup from 'react-bootstrap/lib/ListGroup';
33
import ListGroupItem from 'react-bootstrap/lib/ListGroupItem';
4-
import { Link } from 'react-router';
4+
import { Link } from 'react-router-dom';
55

66
import LinkContainer from '../../src/LinkContainer';
77

test/visual/MenuItemVisual.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import React from 'react';
22
import ButtonToolbar from 'react-bootstrap/lib/ButtonToolbar';
33
import MenuItem from 'react-bootstrap/lib/MenuItem';
44
import SplitButton from 'react-bootstrap/lib/SplitButton';
5-
import { Link } from 'react-router';
5+
import { Link } from 'react-router-dom';
66

77
import LinkContainer from '../../src/LinkContainer';
88

test/visual/NavItemVisual.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import React from 'react';
22
import Nav from 'react-bootstrap/lib/Nav';
33
import NavItem from 'react-bootstrap/lib/NavItem';
4-
import { Link } from 'react-router';
4+
import { Link } from 'react-router-dom';
55

66
import LinkContainer from '../../src/LinkContainer';
77

test/visual/index.js

Lines changed: 13 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import React from 'react';
22
import Grid from 'react-bootstrap/lib/Grid';
33
import ReactDOM from 'react-dom';
4-
import { hashHistory, IndexRedirect, Route, Router } from 'react-router';
4+
import { HashRouter as Router, Route, Redirect } from 'react-router-dom';
55

66
import ButtonVisual from './ButtonVisual';
77
import Home from './Home';
@@ -11,33 +11,22 @@ import NavItemVisual from './NavItemVisual';
1111

1212
import 'bootstrap/less/bootstrap.less';
1313

14-
const propTypes = {
15-
children: React.PropTypes.node.isRequired,
16-
};
17-
18-
const App = ({ children }) => (
19-
<Grid>
20-
<h1>React-Router-Bootstrap Module Visual Test</h1>
21-
{children}
22-
</Grid>
23-
);
24-
25-
App.propTypes = propTypes;
26-
2714
const mountNode = document.createElement('div');
2815
document.body.appendChild(mountNode);
2916

3017
ReactDOM.render(
31-
<Router history={hashHistory}>
32-
<Route path="/" component={App}>
33-
<IndexRedirect to="/home" />
34-
<Route path="home" component={Home} />
35-
36-
<Route path="button" component={ButtonVisual} />
37-
<Route path="nav-item" component={NavItemVisual} />
38-
<Route path="menu-item" component={MenuItemVisual} />
39-
<Route path="list-group-item" component={ListGroupItemVisual} />
40-
</Route>
18+
<Router>
19+
<Grid>
20+
<h1>React-Router-Bootstrap Module Visual Test</h1>
21+
22+
<Route path="/" render={() => <Redirect to="/home" />} />
23+
<Route path="/home" component={Home} />
24+
25+
<Route path="/button" component={ButtonVisual} />
26+
<Route path="/nav-item" component={NavItemVisual} />
27+
<Route path="/menu-item" component={MenuItemVisual} />
28+
<Route path="/list-group-item" component={ListGroupItemVisual} />
29+
</Grid>
4130
</Router>,
4231
mountNode
4332
);

0 commit comments

Comments
 (0)