Skip to content

Commit

Permalink
Update config
Browse files Browse the repository at this point in the history
  • Loading branch information
tjwp committed Jul 5, 2021
1 parent 5d9d704 commit ee4e23c
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 23 deletions.
24 changes: 2 additions & 22 deletions rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -341,25 +341,10 @@ Naming/HeredocDelimiterNaming:

Naming/InclusiveLanguage:
Enabled: true
CheckIdentifiers: true
CheckConstants: true
CheckVariables: true
# CheckStrings is false in the rubocop defaults
CheckStrings: true
CheckSymbols: true
CheckComments: true
CheckFilepaths: true
FlaggedTerms:
whitelist:
Regex: !ruby/regexp '/white[-_\s]?list/'
Suggestions:
- allowlist
- permit
blacklist:
Regex: !ruby/regexp '/black[-_\s]?list/'
Suggestions:
- denylist
- block
AllowedRegex:
- 'web_console.whitelisted_ips'
master:
Suggestions:
- primary
Expand All @@ -368,11 +353,6 @@ Naming/InclusiveLanguage:
- !ruby/regexp '/master[_\s\.]key/' # Rails master key
- 'blob/master/'
- 'origin/master'
slave:
Suggestions:
- replica
- secondary
- follower

Naming/MemoizedInstanceVariableName:
Enabled: false
Expand Down
12 changes: 11 additions & 1 deletion test/fixtures/full_config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1857,7 +1857,7 @@ Naming/HeredocDelimiterNaming:
- !ruby/regexp /(^|\s)(EO[A-Z]{1}|END)(\s|$)/
Naming/InclusiveLanguage:
Description: Recommend the use of inclusive language instead of problematic terms.
Enabled: false
Enabled: true
VersionAdded: '1.18'
CheckIdentifiers: true
CheckConstants: true
Expand All @@ -1872,6 +1872,8 @@ Naming/InclusiveLanguage:
Suggestions:
- allowlist
- permit
AllowedRegex:
- web_console.whitelisted_ips
blacklist:
Regex: !ruby/regexp /black[-_\s]?list/
Suggestions:
Expand All @@ -1882,6 +1884,14 @@ Naming/InclusiveLanguage:
- replica
- secondary
- follower
master:
Suggestions:
- primary
- leader
AllowedRegex:
- !ruby/regexp /master[_\s\.]key/
- blob/master/
- origin/master
Naming/MemoizedInstanceVariableName:
Description: Memoized method name should match memo instance variable name.
Enabled: false
Expand Down

0 comments on commit ee4e23c

Please sign in to comment.