Skip to content

Commit

Permalink
Merge pull request #97 from CodingZeal/greenkeeper-eslint-config-zeal…
Browse files Browse the repository at this point in the history
…-0.11.0

Update eslint-config-zeal to version 0.12.0 🚀
  • Loading branch information
randycoulman authored Oct 7, 2016
2 parents 7541266 + 6755238 commit e176a80
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 8 deletions.
4 changes: 3 additions & 1 deletion client/base/Router.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ const propTypes = {

export default function Router({ history }) {
return (
<ReactRouter children={appRoutes} history={history} />
<ReactRouter history={history}>
{appRoutes}
</ReactRouter>
)
}

Expand Down
7 changes: 5 additions & 2 deletions client/modules/layout/components/Base/__tests__/Base-spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,11 @@ describe('Base', () => {
})

it('renders children within the root element', () => {
expectReactShallow(<Base children={<h1>Test</h1>} type='grid-block' />)
.to.have.rendered(<div><h1>Test</h1></div>)
expectReactShallow(
<Base type='grid-block'>
<h1>Test</h1>
</Base>
).to.have.rendered(<div><h1>Test</h1></div>)
})

it('converts the type prop to a foundation class name', () => {
Expand Down
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"private": true,
"dependencies": {
"babel-core": "^6.16.0",
"babel-eslint": "^6.0.4",
"babel-eslint": "^7.0.0",
"babel-loader": "^6.2.5",
"babel-plugin-transform-decorators-legacy": "^1.3.4",
"babel-preset-latest": "^6.16.0",
Expand All @@ -44,12 +44,12 @@
"classnames": "^2.2.5",
"css-loader": "^0.25.0",
"es6-promise": "^4.0.3",
"eslint": "^3.3.1",
"eslint-config-zeal": "^0.10.0",
"eslint": "^3.7.0",
"eslint-config-zeal": "^0.12.0",
"eslint-import-resolver-webpack": "^0.6.0",
"eslint-loader": "^1.3.0",
"eslint-plugin-import": "^1.13.0",
"eslint-plugin-react": "^6.1.2",
"eslint-plugin-import": "^2.0.0",
"eslint-plugin-react": "yannickcr/eslint-plugin-react#f227eb4",
"expect-react-shallow": "^1.2.1",
"exports-loader": "^0.6.2",
"extract-text-webpack-plugin": "^1.0.1",
Expand Down

0 comments on commit e176a80

Please sign in to comment.