Skip to content

Commit 276ad6b

Browse files
committed
Clean up our own RuboCop configuration
1 parent b6516ba commit 276ad6b

File tree

3 files changed

+12
-13
lines changed

3 files changed

+12
-13
lines changed

.rubocop.yml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,13 @@ AllCops:
1414
- 'tmp/**/*'
1515
- 'spec/smoke_tests/**/*.rb'
1616

17-
# See https://github.com/rubocop/rubocop/issues/6410
1817
Layout/HashAlignment:
19-
Enabled: false
18+
EnforcedHashRocketStyle:
19+
- key
20+
- table
21+
EnforcedColonStyle:
22+
- key
23+
- table
2024

2125
Layout/LineLength:
2226
Max: 80 # default: 120
@@ -29,11 +33,6 @@ Layout/MultilineMethodCallIndentation:
2933
Layout/MultilineOperationIndentation:
3034
EnforcedStyle: indented
3135

32-
Lint/BooleanSymbol:
33-
Exclude:
34-
- lib/rubocop/cop/rspec/expect_actual.rb
35-
- lib/rubocop/cop/rspec/focus.rb
36-
3736
Lint/InterpolationCheck:
3837
Exclude:
3938
- spec/**/*.rb

lib/rubocop/cop/rspec/scattered_setup.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ def on_block(node)
3535
occurrences.each do |occurrence|
3636
lines_except_current = lines - [occurrence.first_line]
3737
message = format(MSG, hook_name: occurrences.first.method_name,
38-
lines: lines_msg(lines_except_current))
38+
lines: lines_msg(lines_except_current))
3939
add_offense(occurrence, message: message)
4040
end
4141
end

spec/rubocop/rspec/config_formatter_spec.rb

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@
99
'Setting' => 'forty two'
1010
},
1111
'RSpec/Foo' => {
12-
'Config' => 2,
13-
'Enabled' => true
12+
'Config' => 2,
13+
'Enabled' => true
1414
},
1515
'RSpec/Bar' => {
16-
'Enabled' => true
16+
'Enabled' => true
1717
},
1818
'RSpec/Baz' => {
19-
'Enabled' => true,
20-
'StyleGuide' => '#buzz'
19+
'Enabled' => true,
20+
'StyleGuide' => '#buzz'
2121
}
2222
}
2323
end

0 commit comments

Comments
 (0)