Skip to content

Commit

Permalink
Merge pull request #285 from code0-tech/renovate/rubocop-rails-2.x-lo…
Browse files Browse the repository at this point in the history
…ckfile

Update dependency rubocop-rails to v2.26.2
  • Loading branch information
Taucher2003 authored Sep 21, 2024
2 parents 6b2bc1b + c5cafa1 commit 6c50923
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 15 deletions.
17 changes: 8 additions & 9 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ GEM
nio4r (2.7.3)
nokogiri (1.16.7-x86_64-linux)
racc (~> 1.4)
parallel (1.25.1)
parallel (1.26.3)
parser (3.3.5.0)
ast (~> 2.4.1)
racc
Expand Down Expand Up @@ -276,27 +276,26 @@ GEM
rspec-support (3.13.1)
rspec_junit_formatter (0.6.0)
rspec-core (>= 2, < 4, != 2.12.0)
rubocop (1.64.1)
rubocop (1.66.1)
json (~> 2.3)
language_server-protocol (>= 3.17.0)
parallel (~> 1.10)
parser (>= 3.3.0.2)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 1.8, < 3.0)
rexml (>= 3.2.5, < 4.0)
rubocop-ast (>= 1.31.1, < 2.0)
regexp_parser (>= 2.4, < 3.0)
rubocop-ast (>= 1.32.2, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 2.4.0, < 3.0)
rubocop-ast (1.31.3)
rubocop-ast (1.32.3)
parser (>= 3.3.1.0)
rubocop-factory_bot (2.26.1)
rubocop (~> 1.61)
rubocop-graphql (1.5.4)
rubocop (>= 1.50, < 2)
rubocop-rails (2.25.1)
rubocop-rails (2.26.2)
activesupport (>= 4.2.0)
rack (>= 1.1)
rubocop (>= 1.33.0, < 2.0)
rubocop (>= 1.52.0, < 2.0)
rubocop-ast (>= 1.31.1, < 2.0)
rubocop-rspec (3.0.5)
rubocop (~> 1.61)
Expand Down Expand Up @@ -327,7 +326,7 @@ GEM
grpc (~> 1.64)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
unicode-display_width (2.5.0)
unicode-display_width (2.6.0)
unparser (0.6.13)
diff-lcs (~> 1.3)
parser (>= 3.3.0)
Expand Down
2 changes: 0 additions & 2 deletions config/initializers/0_inject_extensions.rb
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,7 @@ def active_extensions(constant, namespace)
extension_namespace = find_const(namespace, extension.upcase)
extension_module = find_const(extension_namespace, constant) if extension_namespace

# rubocop:disable Style/RedundantCondition -- this is actually not redundant. returning nil or false makes a difference
extension_module if extension_module
# rubocop:enable Style/RedundantCondition
end.compact
end

Expand Down
5 changes: 1 addition & 4 deletions spec/rails_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,7 @@
# directory. Alternatively, in the individual `*_spec.rb` files, manually
# require only the support files necessary.

# rubocop:disable Lint/RedundantDirGlobSort
Dir[Rails.root.join('spec/support/**/*.rb')].sort.each { |f| require f }
# rubocop:enable Lint/RedundantDirGlobSort

Rails.root.glob('spec/support/**/*.rb').sort.each { |f| require f }
ActiveModel::SecurePassword.min_cost = true

# Checks for pending migrations and applies them before tests are run.
Expand Down

0 comments on commit 6c50923

Please sign in to comment.