Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: fix severity config in ui #5242

Merged
merged 2 commits into from Mar 19, 2020
Merged

fix: fix severity config in ui #5242

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
63793e7
fix: fix severity config in ui
sodatea Mar 4, 2020
d9678b9
test: update test
sodatea Mar 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/@vue/cli-plugin-eslint/__tests__/ui.spec.js
View file
Open in desktop
Expand Up @@ -84,7 +84,7 @@ describe('getEslintPrompts', () => {
extends: 'plugin:vue/recommended',
rules: {
'vue/lorem': ['error', ['asd']], // custom setting
'vue/ipsum': 'warning'
'vue/ipsum': 'warn'
}
}
}
Expand Down Expand Up @@ -146,7 +146,7 @@ describe('getEslintPrompts', () => {
})

it('sets value on prompt item, if the rule was set in project\'s eslint config', () => {
expect(prompts[1].value).toBe('"warning"')
expect(prompts[1].value).toBe('"warn"')
expect(prompts[2].value).toBe('["error",["asd"]]')
})

Expand Down
2 changes: 1 addition & 1 deletion packages/@vue/cli-plugin-eslint/ui/configDescriptor.js
View file
Open in desktop
Expand Up @@ -10,7 +10,7 @@ const CATEGORIES = [
const DEFAULT_CATEGORY = 'essential'
const RULE_SETTING_OFF = 'off'
const RULE_SETTING_ERROR = 'error'
const RULE_SETTING_WARNING = 'warning'
const RULE_SETTING_WARNING = 'warn'
const RULE_SETTINGS = [RULE_SETTING_OFF, RULE_SETTING_ERROR, RULE_SETTING_WARNING]

const defaultChoices = [
Expand Down