diff --git a/README.md b/README.md index 02e4255..f6da704 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,6 @@ Rule | Default | Options ---- | ------- | ------- [missing-perform][] | 2 | [no-browser-pause][] | 2 | -[no-shadowing][] | 2 | [missing-wait-message][] | 1 | [no-browser-sleep][] | 1 | [no-by-xpath][] | 1 | @@ -43,6 +42,7 @@ Rule | Default | Options [no-angular-classes][] | 1 | [use-angular-locators][] | 1 | [use-simple-repeaters][] | 1 | +[no-shadowing][] | 1 | [by-css-shortcut][] | 0 | For example, the `missing-perform` rule is enabled by default and will cause @@ -62,7 +62,6 @@ See [configuring rules][] for more information. [missing-perform]: docs/rules/missing-perform.md [no-browser-pause]: docs/rules/no-browser-pause.md -[no-shadowing]: docs/rules/no-shadowing.md [missing-wait-message]: docs/rules/missing-wait-message.md [no-browser-sleep]: docs/rules/no-browser-sleep.md [no-by-xpath]: docs/rules/no-by-xpath.md @@ -70,6 +69,7 @@ See [configuring rules][] for more information. [no-angular-classes]: docs/rules/no-angular-classes.md [use-angular-locators]: docs/rules/use-angular-locators.md [use-simple-repeaters]: docs/rules/use-simple-repeaters.md +[no-shadowing]: docs/rules/no-shadowing.md [by-css-shortcut]: docs/rules/by-css-shortcut.md [configuring rules]: http://eslint.org/docs/user-guide/configuring#configuring-rules diff --git a/index.js b/index.js index c55ad8c..a3ae988 100644 --- a/index.js +++ b/index.js @@ -4,7 +4,6 @@ module.exports = { rules: { 'missing-perform': require('./lib/rules/missing-perform'), 'no-browser-pause': require('./lib/rules/no-browser-pause'), - 'no-shadowing': require('./lib/rules/no-shadowing'), 'missing-wait-message': require('./lib/rules/missing-wait-message'), 'no-browser-sleep': require('./lib/rules/no-browser-sleep'), 'no-by-xpath': require('./lib/rules/no-by-xpath'), @@ -12,14 +11,14 @@ module.exports = { 'by-css-shortcut': require('./lib/rules/by-css-shortcut'), 'no-angular-classes': require('./lib/rules/no-angular-classes'), 'use-angular-locators': require('./lib/rules/use-angular-locators'), - 'use-simple-repeaters': require('./lib/rules/use-simple-repeaters') + 'use-simple-repeaters': require('./lib/rules/use-simple-repeaters'), + 'no-shadowing': require('./lib/rules/no-shadowing') }, configs: { recommended: { rules: { 'protractor/missing-perform': 2, 'protractor/no-browser-pause': 2, - 'protractor/no-shadowing': 2, 'protractor/missing-wait-message': 1, 'protractor/no-browser-sleep': 1, 'protractor/no-by-xpath': 1, @@ -27,6 +26,7 @@ module.exports = { 'protractor/no-angular-classes': 1, 'protractor/use-angular-locators': 1, 'protractor/use-simple-repeaters': 1, + 'protractor/no-shadowing': 1, 'protractor/by-css-shortcut': 0 } }