Commit 1e93657c authored by Rémy Coutable's avatar Rémy Coutable

Merge branch 'jej/inline-rspec-filepath-cop' into 'master'

Inline RSpec/FilePath rubocop rule

See merge request gitlab-org/gitlab-ce!22233
parents 550f5574 b75b516c
...@@ -3,7 +3,9 @@ inherit_gem: ...@@ -3,7 +3,9 @@ inherit_gem:
- rubocop-default.yml - rubocop-default.yml
inherit_from: .rubocop_todo.yml inherit_from: .rubocop_todo.yml
require: ./rubocop/rubocop require:
- ./rubocop/rubocop
- rubocop-rspec
AllCops: AllCops:
TargetRailsVersion: 4.2 TargetRailsVersion: 4.2
...@@ -54,6 +56,13 @@ Style/FrozenStringLiteralComment: ...@@ -54,6 +56,13 @@ Style/FrozenStringLiteralComment:
- 'scripts/**/*' - 'scripts/**/*'
- 'spec/**/*' - 'spec/**/*'
RSpec/FilePath:
Exclude:
- 'qa/**/*'
- 'spec/javascripts/fixtures/*'
- 'ee/spec/javascripts/fixtures/*'
- 'spec/requests/api/v3/*'
Naming/FileName: Naming/FileName:
ExpectMatchingDefinition: true ExpectMatchingDefinition: true
Exclude: Exclude:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment