Skip to content

Commit

Permalink
bump testing deps and cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
giogonzo committed Nov 16, 2016
1 parent 9d3b05e commit 06d00ae
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 35 deletions.
17 changes: 1 addition & 16 deletions .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@
"node": true,
"es6": true
},
"plugins": [
"react"
],
"ecmaFeatures": {
"modules": true,
"jsx": true
Expand All @@ -21,18 +18,6 @@
"strict": [2, "global"],
"no-underscore-dangle": 0,
"quotes": [2, "single"],
"comma-dangle": 2,
"react/jsx-boolean-value": 1,
"react/jsx-quotes": 1,
"react/jsx-no-undef": 1,
"react/jsx-uses-react": 1,
"react/jsx-uses-vars": 1,
"react/no-did-mount-set-state": 1,
"react/no-did-update-set-state": 1,
"react/no-multi-comp": 1,
"react/no-unknown-property": 1,
"react/react-in-jsx-scope": 1,
"react/self-closing-comp": 1,
"react/wrap-multilines": 1
"comma-dangle": 2
}
}
12 changes: 6 additions & 6 deletions karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,28 +17,28 @@ module.exports = function (config) {

singleRun: true,

plugins: [ 'karma-mocha', 'karma-webpack', 'karma-chrome-launcher' ],

frameworks: [ 'mocha' ],

files: [
'karma.js'
],

preprocessors: {
'karma.js': [ 'webpack' ],
'karma.js': [ 'webpack' ]
},

reporters: process.env.CONTINUOUS_INTEGRATION ? [ 'bamboo', 'coverage' ] : [ 'dots', 'coverage' ],
reporters: [ 'dots' ],

bambooReporter: {
filename: 'mocha.json',
filename: 'mocha.json'
},

coverageReporter: {
reporters: [
process.env.CONTINUOUS_INTEGRATION ?
{ type: 'lcov', subdir: 'lcov-report' } :
{ type: 'html', subdir: 'html-report' }
],
]
},

webpack: {
Expand Down
23 changes: 10 additions & 13 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,22 +17,19 @@
"author": "Giovanni Gonzaga <[email protected]>",
"license": "MIT",
"devDependencies": {
"babel": "^5.4.7",
"babel-eslint": "^3.1.11",
"babel-loader": "^5.1.3",
"eslint": "^0.23.0",
"eslint-loader": "^0.14.0",
"eslint-plugin-react": "^2.5.2",
"babel": "^5.8.38",
"babel-eslint": "^6.1.2",
"babel-loader": "^5.4.2",
"eslint": "^3.10.2",
"eslint-loader": "^1.6.1",
"expect": "^1.6.0",
"isparta-loader": "^0.2.0",
"karma": "^0.12.36",
"karma-bamboo-reporter": "^0.1.0",
"karma-chrome-launcher": "^0.1.12",
"karma-coverage": "^0.3.1",
"karma-mocha": "^0.1.10",
"karma-webpack": "^1.5.1",
"karma": "^1.3.0",
"karma-chrome-launcher": "^2.0.0",
"karma-mocha": "^1.3.0",
"karma-webpack": "^1.8.0",
"mocha": "^2.2.5",
"require-dir": "^0.3.0",
"webpack": "^1.9.10"
"webpack": "^1.13.3"
}
}

0 comments on commit 06d00ae

Please sign in to comment.