Skip to content

Commit

Permalink
Housekeeping eslint for v2.0 (vuejs#553)
Browse files Browse the repository at this point in the history
* bump eslint-config-vue

* rename .eslintrc

* enable lint checking for test codes and fix some errors

* bump vue related eslint plugins
  • Loading branch information
ktsn authored Feb 4, 2017
1 parent ba5a129 commit a7d2182
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 9 deletions.
File renamed without changes.
7 changes: 4 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@
"build": "npm run build:main && npm run build:logger",
"build:main": "rollup -c build/rollup.config.js && uglifyjs dist/vuex.js -cm --comments -o dist/vuex.min.js",
"build:logger": "rollup -c build/rollup.logger.config.js",
"test": "eslint src && npm run test:types && npm run test:unit && npm run test:e2e",
"lint": "eslint src test",
"test": "npm run lint && npm run test:types && npm run test:unit && npm run test:e2e",
"test:unit": "rollup -c build/rollup.config.js && jasmine JASMINE_CONFIG_PATH=test/unit/jasmine.json",
"test:e2e": "node test/e2e/runner.js",
"test:types": "tsc -p types/test",
Expand Down Expand Up @@ -48,8 +49,8 @@
"cross-spawn": "^4.0.0",
"css-loader": "^0.25.0",
"eslint": "^3.5.0",
"eslint-config-vue": "^1.0.0",
"eslint-plugin-html": "^1.5.2",
"eslint-config-vue": "^2.0.2",
"eslint-plugin-vue": "^2.0.1",
"express": "^4.14.0",
"jasmine": "2.4.1",
"jasmine-core": "2.4.1",
Expand Down
1 change: 0 additions & 1 deletion test/e2e/runner.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
var path = require('path')
var spawn = require('cross-spawn')
var args = process.argv.slice(2)

Expand Down
2 changes: 1 addition & 1 deletion test/e2e/specs/todomvc.js
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ module.exports = {
.assert.count('.todo', 1)
.assert.count('.todo.completed', 0)
// add item with filter active
createNewItem('test')
createNewItem('test')
.assert.count('.todo', 2)

// complted filter
Expand Down
File renamed without changes.
3 changes: 1 addition & 2 deletions test/unit/modules.spec.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import Vue from 'vue/dist/vue.common.js'
import Vuex from '../../dist/vuex.js'

const TEST = 'TEST'
Expand Down Expand Up @@ -298,7 +297,7 @@ describe('Modules', () => {
b: createModule('b', false, { // a/b - does not add namespace
c: createModule('c', true) // a/c/c
}),
d: createModule('d', true), // a/d/d
d: createModule('d', true) // a/d/d
})
}

Expand Down
4 changes: 2 additions & 2 deletions test/unit/store.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -210,9 +210,9 @@ describe('Store', () => {
const store = new Vuex.Store({
mutations: {
[TEST] () {}
},
}
})
store.commit(TEST, {}, { silent: true });
store.commit(TEST, {}, { silent: true })

expect(console.warn).toHaveBeenCalledWith(
`[vuex] mutation type: ${TEST}. Silent option has been removed. ` +
Expand Down

0 comments on commit a7d2182

Please sign in to comment.