Skip to content

Commit b0a4291

Browse files
committed
Normalize RuboCop configuration
1 parent e18a8d1 commit b0a4291

File tree

4 files changed

+136
-152
lines changed

4 files changed

+136
-152
lines changed

.rubocop.yml

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,9 @@
1-
inherit_from: .rubocop_rspec_base.yml
2-
3-
# Over time we'd like to get this down, but this is what we're at now.
4-
LineLength:
5-
Max: 186
6-
7-
# Over time we'd like to get this down, but this is what we're at now.
8-
MethodLength:
9-
Max: 50
1+
inherit_from:
2+
- .rubocop_todo.yml
3+
- .rubocop_rspec_base.yml
104

115
# We use spaces, so it's less of a change to stick with that.
12-
SpaceAroundEqualsInParameterDefault:
6+
Layout/SpaceAroundEqualsInParameterDefault:
137
EnforcedStyle: space
148

159
################################################################################
@@ -21,24 +15,24 @@ AllCops:
2115
# Templates are really ERB which Rubocop does not parse
2216
- 'lib/generators/rspec/*/templates/**/*'
2317

24-
FileName:
18+
Naming/FileName:
2519
Exclude:
2620
# We break convention here so that when bundler requires the gem, which
2721
# uses the gem name, things work without user configuration.
2822
- lib/rspec-rails.rb
2923

30-
HandleExceptions:
24+
Lint/SuppressedException:
3125
Exclude:
3226
# RSpec is tightly coupled to capybara right now, this should be
3327
# re-evaluted in the future. For now we allow the empty rescue
3428
- lib/rspec/rails/vendor/capybara.rb
3529

36-
IfUnlessModifier:
30+
Style/IfUnlessModifier:
3731
Exclude:
3832
# Allow single line statement as the style matches the remainder of the file
3933
- lib/rspec/rails/vendor/capybara.rb
4034

41-
PerlBackrefs:
35+
Style/PerlBackrefs:
4236
Exclude:
4337
# We probably can refactor the backref out, but for now excluding it since
4438
# we can't use named matches in 1.8.7
@@ -50,7 +44,7 @@ Style/AccessModifierDeclarations:
5044
Naming/MemoizedInstanceVariableName:
5145
Enabled: false
5246

53-
Naming/UncommunicativeMethodParamName:
47+
Naming/MethodParameterName:
5448
Enabled: false
5549

5650
Metrics/PerceivedComplexity:
@@ -65,7 +59,7 @@ Lint/AssignmentInCondition:
6559
Lint/EmptyExpression:
6660
Enabled: false
6761

68-
Layout/AlignHash:
62+
Layout/HashAlignment:
6963
Enabled: false
7064

7165
Naming/RescuedExceptionsVariableName:

0 commit comments

Comments
 (0)