Skip to content

Commit

Permalink
Merge pull request #1514 from jonkerz/3.7.18.6-gem-updates-i
Browse files Browse the repository at this point in the history
3.7.18.6 gem updates 1
  • Loading branch information
jonkerz authored Dec 7, 2024
2 parents 6e476ac + edad7c5 commit 51ab4a1
Show file tree
Hide file tree
Showing 20 changed files with 280 additions and 249 deletions.
1 change: 1 addition & 0 deletions .haml-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ linters:
RuboCop:
enabled: true
ignored_cops:
- Layout/ArgumentAlignment
- Layout/ElseAlignment
- Layout/EndAlignment
- Layout/IndentationWidth
Expand Down
46 changes: 40 additions & 6 deletions .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,23 @@ AllCops:

### Capybara.

# TODO: Enable.
Capybara/ClickLinkOrButtonStyle:
Enabled: false

Capybara/SpecificFinders:
Enabled: false

# FactoryBot.

# FactoryBot/CreateList:
RSpec/FactoryBot/CreateList:
EnforcedStyle: n_times

# FactoryBot/ConsistentParenthesesStyle:
RSpec/FactoryBot/ConsistentParenthesesStyle:
Enabled: false

### Layout.

Layout/ArgumentAlignment:
Expand Down Expand Up @@ -110,10 +124,17 @@ Lint/EmptyBlock:
Lint/HeredocMethodCallPosition:
Enabled: true

# TODO: Investigate.
Lint/LiteralAssignmentInCondition:
Enabled: false

Lint/MissingSuper:
Exclude:
- 'app/components/**/*'

Lint/RedundantCopDisableDirective:
Enabled: false

Lint/RequireRelativeSelfPath:
Exclude:
- 'lib/tasks/**/*.rake'
Expand Down Expand Up @@ -200,6 +221,9 @@ Naming/VariableNumber:
Performance/MapCompact:
Enabled: false

Performance/MapMethodChain:
Enabled: false

Performance/MethodObjectAsBlock:
Enabled: false

Expand Down Expand Up @@ -235,6 +259,9 @@ Rails/EnvironmentVariableAccess:
Enabled: true
AllowReads: true

Rails/FindEach:
Enabled: false

Rails/FreezeTime:
Enabled: false

Expand Down Expand Up @@ -340,12 +367,6 @@ RSpec/ExampleLength:
RSpec/ExpectChange:
EnforcedStyle: block

RSpec/FactoryBot/CreateList:
EnforcedStyle: n_times

RSpec/FactoryBot/ConsistentParenthesesStyle:
Enabled: false

RSpec/FilePath:
# TODO: See if we can remove this after https://github.com/rubocop/rubocop-rspec/pull/1266
CustomTransform:
Expand Down Expand Up @@ -501,6 +522,19 @@ Style/RedundantConstantBase:
- 'config/environments/production.rb'
- 'config/environments/staging.rb'

# TODO: Investigate.
Style/RedundantDoubleSplatHashBraces:
Enabled: false

Style/RedundantParentheses:
Enabled: false

Style/RedundantRegexpArgument:
Enabled: false

Style/RedundantReturn:
Enabled: false

Style/ReturnNil:
Enabled: true

Expand Down
3 changes: 2 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,8 @@ group :development, :test do
gem 'haml_lint', require: false
gem 'pry'
gem 'rspec-rails'
gem 'rubocop', '~> 1.50.0', require: false
gem 'rubocop', '~> 1.59.0', require: false
gem 'rubocop-capybara', require: false
gem 'rubocop-performance'
gem 'rubocop-rails'
gem 'rubocop-rake'
Expand Down
Loading

0 comments on commit 51ab4a1

Please sign in to comment.