Skip to content

Commit f491fd6

Browse files
committed
use eslint:recommended
1 parent da35fb6 commit f491fd6

36 files changed

Lines changed: 171 additions & 123 deletions

.eslintrc

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,22 @@
11
{
22
"parser": "babel-eslint",
33
"extends": [
4-
"standard",
4+
"eslint:recommended",
5+
"plugin:mocha/recommended",
56
"standard-react"
67
],
78
"plugins": [
89
"babel",
10+
"mocha",
911
"react",
1012
"promise"
1113
],
1214
"env": {
13-
"mocha" : true
15+
"mocha": true,
16+
"node": true
1417
},
1518
"globals": {
16-
"document": false,
17-
"expect": false,
18-
"navigator": false,
19-
"sinon": false,
20-
"window": false
19+
"Symbol": false
2120
},
2221
"rules": {}
2322
}

app/app.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
/* global window, document */
12
import 'babel-polyfill'
23
import { browserHistory } from 'react-router'
34
import Immutable from 'immutable'
@@ -17,6 +18,7 @@ if (window.__REDUX_STATE__) {
1718
reduxState[key] = Immutable.fromJS(val)
1819
})
1920
} catch (e) {
21+
// eslint-disable-next-line no-console
2022
console.error(e)
2123
}
2224
}
@@ -27,4 +29,4 @@ ReactDOM.render((
2729
<Provider store={store}>
2830
{ createRoutes(browserHistory) }
2931
</Provider>
30-
), document.getElementById('root'))
32+
), document.getElementById('root'))

app/components/App/index.jsx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,17 @@ FieldDBObject.todo = function () {}
88
FieldDBObject.warn = function () {}
99
FieldDBObject.confirm = function (message, optionalLocale) {
1010
const deferred = Q.defer()
11-
console.warn('Not confirming: ', message)
11+
// console.warn('Not confirming: ', message)
1212
deferred.reject({
1313
message: message,
1414
optionalLocale: optionalLocale,
1515
response: null
1616
})
1717
return deferred.promise
1818
}
19-
FieldDBObject.prompt = function (message, optionalLocale, providedInput) {
19+
FieldDBObject.prompt = function (message, optionalLocale) {
2020
const deferred = Q.defer()
21-
console.warn('Not prompting: ', message)
21+
// console.warn('Not prompting: ', message)
2222
deferred.reject({
2323
message: message,
2424
optionalLocale: optionalLocale,
@@ -47,7 +47,7 @@ class App extends Component {
4747
htmlAttributes={{
4848
'lang': 'en'
4949
}}
50-
/>
50+
/>
5151
{this.props.children}
5252
</div>
5353
)
@@ -58,7 +58,7 @@ App.propTypes = {
5858
children: React.PropTypes.object.isRequired
5959
}
6060

61-
function mapStateToProps (state) {
61+
function mapStateToProps () {
6262
return {}
6363
}
6464

app/components/App/store.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,15 @@ const logger = createLogger({
99
level: 'info',
1010
collapsed: false,
1111
logger: console,
12-
predicate: (getState, action) => true
12+
predicate: () => true
1313
})
1414

1515
let middlewares = [
1616
thunkMiddleware,
1717
apiMiddleware
1818
]
1919

20+
// By default: debug all state changes if in development mode
2021
if (process.env.NODE_ENV !== 'production') {
2122
middlewares = [...middlewares, logger]
2223
}

app/components/Corpora/Corpora.jsx

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -8,30 +8,30 @@ class Corpora extends Component {
88
<div className={this.props.className}>
99
<h1>Corpora</h1>
1010
{
11-
this.props.corpora.map((connection) => {
12-
let website = connection.get('website') || ''
13-
if (connection.get('searchKeywords')) {
14-
website = `${website}/search/${connection.get('searchKeywords')}`
15-
} else {
16-
website = `${website}/search`
17-
}
18-
return (
19-
<div className='media' key={connection.get('dbname')}>
20-
<Link to={website} className='pull-left'>
21-
<img src={'https://secure.gravatar.com/avatar/' + connection.get('gravatar') + '.jpg?s=96&d=retro&r=pg'} alt='Corpus image' className='media-object' />
22-
</Link>
23-
<div className='media-body'>
24-
<h4 className='media-heading'>
25-
<Link to={website}>
26-
{connection.get('title')}
11+
this.props.corpora.map((connection) => {
12+
let website = connection.get('website') || ''
13+
if (connection.get('searchKeywords')) {
14+
website = `${website}/search/${connection.get('searchKeywords')}`
15+
} else {
16+
website = `${website}/search`
17+
}
18+
return (
19+
<div className='media' key={connection.get('dbname')}>
20+
<Link to={website} className='pull-left'>
21+
<img src={'https://secure.gravatar.com/avatar/' + connection.get('gravatar') + '.jpg?s=96&d=retro&r=pg'} alt='Corpus image' className='media-object' />
2722
</Link>
28-
</h4>
29-
<p>{connection.get('description')}</p>
30-
</div>
31-
</div>
32-
)
33-
})
34-
}
23+
<div className='media-body'>
24+
<h4 className='media-heading'>
25+
<Link to={website}>
26+
{connection.get('title')}
27+
</Link>
28+
</h4>
29+
<p>{connection.get('description')}</p>
30+
</div>
31+
</div>
32+
)
33+
})
34+
}
3535
</div>
3636
)
3737
}

app/components/Corpora/Corpora.test.js

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,18 @@
1+
import { expect } from 'chai'
12
import Immutable from 'immutable'
23
import { Link } from 'react-router'
34
import React from 'react'
45
import { shallow } from 'enzyme'
56

67
import Corpora from './Corpora.jsx'
78

9+
function renderDoc (props) {
10+
return shallow(<Corpora {...props} />)
11+
}
12+
813
describe('Component::Corpora', function () {
9-
let props
14+
let props;
15+
1016
beforeEach(function () {
1117
props = {
1218
corpora: Immutable.fromJS([
@@ -27,12 +33,9 @@ describe('Component::Corpora', function () {
2733
])
2834
}
2935
})
30-
function renderDoc () {
31-
return shallow(<Corpora {...props} />)
32-
}
3336

3437
it('renders corpora', function () {
35-
let doc = renderDoc()
38+
let doc = renderDoc(props)
3639
let corpusMaskComps = doc.find(Link)
3740

3841
expect(corpusMaskComps.length).to.equal(props.corpora.size * 2)

app/components/Corpora/CorporaContainer.test.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1+
import { expect } from 'chai'
12
import Immutable from 'immutable'
23
import React from 'react'
34
import { shallow } from 'enzyme'
5+
import sinon from 'sinon'
46

57
import Corpora from './Corpora.jsx'
68
import { CorpusMaskContainer } from './index.jsx'

app/components/Corpora/actions.test.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import { expect } from 'chai'
12
import { CALL_API } from 'middleware/api'
23

34
import * as actionCreator from './actions'

app/components/Corpora/reducer.test.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import { expect } from 'chai'
12
import * as ActionType from './actions'
23
import corpusMaskReducer from './reducer'
34

app/components/CorpusMask/CorpusMaskContainer.test.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1+
import { expect } from 'chai'
12
import { browserHistory } from 'react-router'
23
import Immutable from 'immutable'
34
import { mount, shallow } from 'enzyme'
45
import React from 'react'
6+
import sinon from 'sinon'
57

68
import { CorpusMaskContainer } from './index.jsx'
79

0 commit comments

Comments
 (0)