Skip to content

Commit ec36ab7

Browse files
bf4Yohan Robert
authored andcommitted
Update Rubocop
1 parent c97a80d commit ec36ab7

File tree

3 files changed

+19
-20
lines changed

3 files changed

+19
-20
lines changed

.rubocop.yml

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,20 @@ AllCops:
44
Exclude:
55
- config/initializers/forbidden_yaml.rb
66
- !ruby/regexp /(vendor|bundle|bin|db|tmp)\/.*/
7-
RunRailsCops: true
87
DisplayCopNames: true
98
DisplayStyleGuide: true
109

10+
Rails:
11+
Enabled: true
12+
1113
Lint/NestedMethodDefinition:
1214
Enabled: false
1315
Exclude:
1416
- test/action_controller/serialization_test.rb
1517

18+
Style/Alias:
19+
EnforcedStyle: prefer_alias
20+
1621
Style/StringLiterals:
1722
EnforcedStyle: single_quotes
1823

@@ -59,6 +64,18 @@ Style/BlockDelimiters:
5964
Enabled: true
6065
EnforcedStyle: line_count_based
6166

67+
Style/SignalException:
68+
EnforcedStyle: semantic
69+
70+
Style/TrailingCommaInLiteral:
71+
EnforcedStyleForMultiline: no_comma
72+
73+
Style/ConditionalAssignment:
74+
Enabled: false
75+
76+
Style/DotPosition:
77+
EnforcedStyle: leading
78+
6279
########## test_helper.rb sanity
6380
Style/EndBlock:
6481
Exclude:

.rubocop_todo.yml

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -177,14 +177,6 @@ Style/Semicolon:
177177
Exclude:
178178
- 'lib/active_model/serializer/fieldset.rb'
179179

180-
# Offense count: 3
181-
# Cop supports --auto-correct.
182-
# Configuration parameters: EnforcedStyle, SupportedStyles.
183-
Style/SignalException:
184-
Exclude:
185-
- 'lib/active_model/serializer/fieldset.rb'
186-
- 'lib/active_model/serializer/pass_through_serializer.rb'
187-
188180
# Offense count: 1
189181
# Cop supports --auto-correct.
190182
# Configuration parameters: AllowIfMethodIsEmpty.
@@ -223,16 +215,6 @@ Style/TrailingBlankLines:
223215
- 'test/serializers/cache_test.rb'
224216
- 'test/serializers/fieldset_test.rb'
225217

226-
# Offense count: 5
227-
# Cop supports --auto-correct.
228-
# Configuration parameters: EnforcedStyleForMultiline, SupportedStyles.
229-
Style/TrailingComma:
230-
Exclude:
231-
- 'test/action_controller/adapter_selector_test.rb'
232-
- 'test/action_controller/serialization_test.rb'
233-
- 'test/adapter/json_api/belongs_to_test.rb'
234-
- 'test/adapter/json_api/linked_test.rb'
235-
236218
# Offense count: 1
237219
Style/UnlessElse:
238220
Exclude:

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,5 +44,5 @@ group :test do
4444
end
4545

4646
group :development, :test do
47-
gem 'rubocop', '~> 0.34.0', require: false
47+
gem 'rubocop', '~> 0.36', require: false
4848
end

0 commit comments

Comments
 (0)