Skip to content

Commit f801c39

Browse files
authored
Merge pull request #764 from Shopify/rm-naming-department
Enable cops in the Naming department
2 parents 92b3246 + 117885b commit f801c39

File tree

2 files changed

+11
-37
lines changed

2 files changed

+11
-37
lines changed

rubocop.yml

Lines changed: 1 addition & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -532,11 +532,6 @@ Metrics/PerceivedComplexity:
532532
Enabled: false
533533

534534

535-
# Migration Department
536-
Migration/DepartmentName:
537-
Enabled: false
538-
539-
540535
# Naming Department
541536
Naming/AccessorMethodName:
542537
Enabled: false
@@ -550,34 +545,17 @@ Naming/BinaryOperatorParameterName:
550545
Naming/BlockForwarding:
551546
Enabled: false
552547

553-
Naming/BlockParameterName:
554-
Enabled: false
555-
556-
Naming/ClassAndModuleCamelCase:
557-
Enabled: false
558-
559-
Naming/ConstantName:
560-
Enabled: false
561-
562548
Naming/FileName:
563549
Enabled: false
564550

565-
Naming/HeredocDelimiterCase:
566-
Enabled: false
567-
568551
Naming/HeredocDelimiterNaming:
569552
Enabled: false
570553

571554
Naming/MemoizedInstanceVariableName:
572555
Enabled: false
573556

574-
Naming/MethodName:
575-
Enabled: false
576-
AllowedPatterns:
577-
- '\Atest_'
578-
579557
Naming/MethodParameterName:
580-
Enabled: false
558+
MinNameLength: 1
581559

582560
<% if rubocop_version >= "1.76" %>
583561
Naming/PredicateMethod:
@@ -598,9 +576,6 @@ Naming/PredicateName:
598576
Naming/RescuedExceptionsVariableName:
599577
Enabled: false
600578

601-
Naming/VariableName:
602-
Enabled: false
603-
604579
Naming/VariableNumber:
605580
Enabled: false
606581

test/fixtures/full_config.yml

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2132,7 +2132,7 @@ Metrics/PerceivedComplexity:
21322132
Migration/DepartmentName:
21332133
Description: Check that cop names in rubocop:disable (etc) comments are given with
21342134
department name.
2135-
Enabled: false
2135+
Enabled: true
21362136
VersionAdded: '0.75'
21372137
Naming/AccessorMethodName:
21382138
Description: Checks the naming of accessor methods for get_/set_.
@@ -2165,7 +2165,7 @@ Naming/BlockForwarding:
21652165
Naming/BlockParameterName:
21662166
Description: Checks for block parameter names that contain capital letters, end
21672167
in numbers, or do not meet a minimal length.
2168-
Enabled: false
2168+
Enabled: true
21692169
VersionAdded: '0.53'
21702170
VersionChanged: '0.77'
21712171
MinNameLength: 1
@@ -2175,15 +2175,15 @@ Naming/BlockParameterName:
21752175
Naming/ClassAndModuleCamelCase:
21762176
Description: Use CamelCase for classes and modules.
21772177
StyleGuide: "#camelcase-classes"
2178-
Enabled: false
2178+
Enabled: true
21792179
VersionAdded: '0.50'
21802180
VersionChanged: '0.85'
21812181
AllowedNames:
21822182
- module_parent
21832183
Naming/ConstantName:
21842184
Description: Constants should use SCREAMING_SNAKE_CASE.
21852185
StyleGuide: "#screaming-snake-case"
2186-
Enabled: false
2186+
Enabled: true
21872187
VersionAdded: '0.50'
21882188
Naming/FileName:
21892189
Description: Use snake_case for source file names.
@@ -2246,7 +2246,7 @@ Naming/FileName:
22462246
Naming/HeredocDelimiterCase:
22472247
Description: Use configured case for heredoc delimiters.
22482248
StyleGuide: "#heredoc-delimiters"
2249-
Enabled: false
2249+
Enabled: true
22502250
VersionAdded: '0.50'
22512251
VersionChanged: '1.2'
22522252
EnforcedStyle: uppercase
@@ -2303,26 +2303,25 @@ Naming/MemoizedInstanceVariableName:
23032303
Naming/MethodName:
23042304
Description: Use the configured style when naming methods.
23052305
StyleGuide: "#snake-case-symbols-methods-vars"
2306-
Enabled: false
2306+
Enabled: true
23072307
VersionAdded: '0.50'
23082308
VersionChanged: '1.75'
23092309
EnforcedStyle: snake_case
23102310
SupportedStyles:
23112311
- snake_case
23122312
- camelCase
2313-
AllowedPatterns:
2314-
- "\\Atest_"
2313+
AllowedPatterns: []
23152314
ForbiddenIdentifiers:
23162315
- __id__
23172316
- __send__
23182317
ForbiddenPatterns: []
23192318
Naming/MethodParameterName:
23202319
Description: Checks for method parameter names that contain capital letters, end
23212320
in numbers, or do not meet a minimal length.
2322-
Enabled: false
2321+
Enabled: true
23232322
VersionAdded: '0.53'
23242323
VersionChanged: '0.77'
2325-
MinNameLength: 3
2324+
MinNameLength: 1
23262325
AllowNamesEndingInNumbers: true
23272326
AllowedNames:
23282327
- as
@@ -2381,7 +2380,7 @@ Naming/RescuedExceptionsVariableName:
23812380
Naming/VariableName:
23822381
Description: Use the configured style when naming variables.
23832382
StyleGuide: "#snake-case-symbols-methods-vars"
2384-
Enabled: false
2383+
Enabled: true
23852384
VersionAdded: '0.50'
23862385
VersionChanged: '1.73'
23872386
EnforcedStyle: snake_case

0 commit comments

Comments
 (0)