From 2811081d29b09973e55ae8e6e7494e2dcb031264 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 1 Nov 2024 10:35:00 +0000 Subject: [PATCH 1/2] Bump the bundler-lint group with 5 updates Bumps the bundler-lint group with 5 updates: | Package | From | To | | --- | --- | --- | | [brakeman](https://github.com/presidentbeef/brakeman) | `6.2.1` | `6.2.2` | | [erb_lint](https://github.com/Shopify/erb-lint) | `0.6.0` | `0.7.0` | | [rubocop](https://github.com/rubocop/rubocop) | `1.65.0` | `1.68.0` | | [rubocop-rails](https://github.com/rubocop/rubocop-rails) | `2.26.2` | `2.27.0` | | [rubocop-rspec](https://github.com/rubocop/rubocop-rspec) | `3.1.0` | `3.2.0` | Updates `brakeman` from 6.2.1 to 6.2.2 - [Release notes](https://github.com/presidentbeef/brakeman/releases) - [Changelog](https://github.com/presidentbeef/brakeman/blob/main/CHANGES.md) - [Commits](https://github.com/presidentbeef/brakeman/compare/v6.2.1...v6.2.2) Updates `erb_lint` from 0.6.0 to 0.7.0 - [Release notes](https://github.com/Shopify/erb-lint/releases) - [Commits](https://github.com/Shopify/erb-lint/compare/v0.6.0...v0.7.0) Updates `rubocop` from 1.65.0 to 1.68.0 - [Release notes](https://github.com/rubocop/rubocop/releases) - [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop/rubocop/compare/v1.65.0...v1.68.0) Updates `rubocop-rails` from 2.26.2 to 2.27.0 - [Release notes](https://github.com/rubocop/rubocop-rails/releases) - [Changelog](https://github.com/rubocop/rubocop-rails/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop/rubocop-rails/compare/v2.26.2...v2.27.0) Updates `rubocop-rspec` from 3.1.0 to 3.2.0 - [Release notes](https://github.com/rubocop/rubocop-rspec/releases) - [Changelog](https://github.com/rubocop/rubocop-rspec/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop/rubocop-rspec/compare/v3.1.0...v3.2.0) --- updated-dependencies: - dependency-name: brakeman dependency-type: direct:development update-type: version-update:semver-patch dependency-group: bundler-lint - dependency-name: erb_lint dependency-type: direct:development update-type: version-update:semver-minor dependency-group: bundler-lint - dependency-name: rubocop dependency-type: direct:development update-type: version-update:semver-minor dependency-group: bundler-lint - dependency-name: rubocop-rails dependency-type: direct:development update-type: version-update:semver-minor dependency-group: bundler-lint - dependency-name: rubocop-rspec dependency-type: direct:development update-type: version-update:semver-minor dependency-group: bundler-lint ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 16533c31..6c05d376 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -128,7 +128,7 @@ GEM bigdecimal (3.1.8-java) bootsnap (1.18.4) msgpack (~> 1.2) - brakeman (6.2.1) + brakeman (6.2.2) racc builder (3.3.0) capybara (3.40.0) @@ -163,7 +163,7 @@ GEM easy_translate (0.5.1) thread thread_safe - erb_lint (0.6.0) + erb_lint (0.7.0) activesupport better_html (>= 2.0.1) parser (>= 2.7.1.4) @@ -228,15 +228,15 @@ GEM reline (>= 0.4.2) jar-dependencies (0.4.1) jdbc-postgres (42.6.0) - json (2.7.2) - json (2.7.2-java) + json (2.7.5) + json (2.7.5-java) kramdown (2.4.0) rexml kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) language_server-protocol (3.17.0.3) logger (1.6.1) - loofah (2.22.0) + loofah (2.23.1) crass (~> 1.0.2) nokogiri (>= 1.12.0) mail (2.8.1) @@ -291,7 +291,7 @@ GEM sawyer (~> 0.9) optimist (3.1.0) parallel (1.26.3) - parser (3.3.5.0) + parser (3.3.5.1) ast (~> 2.4.1) racc pg (1.5.8) @@ -315,7 +315,7 @@ GEM raabro (1.4.0) racc (1.8.1) racc (1.8.1-java) - rack (3.1.7) + rack (3.1.8) rack-mini-profiler (3.3.1) rack (>= 1.2.0) rack-session (2.0.0) @@ -371,7 +371,7 @@ GEM regexp_parser (2.9.2) reline (0.5.10) io-console (~> 0.5) - rexml (3.3.8) + rexml (3.3.9) rspec-core (3.13.1) rspec-support (~> 3.13.0) rspec-expectations (3.13.3) @@ -389,30 +389,29 @@ GEM rspec-mocks (~> 3.13) rspec-support (~> 3.13) rspec-support (3.13.1) - rubocop (1.65.0) + rubocop (1.68.0) 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 (>= 2.4, < 3.0) - rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.31.1, < 2.0) + rubocop-ast (>= 1.32.2, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.32.3) + rubocop-ast (1.33.0) parser (>= 3.3.1.0) rubocop-capybara (2.21.0) rubocop (~> 1.41) rubocop-performance (1.22.1) rubocop (>= 1.48.1, < 2.0) rubocop-ast (>= 1.31.1, < 2.0) - rubocop-rails (2.26.2) + rubocop-rails (2.27.0) activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 1.52.0, < 2.0) rubocop-ast (>= 1.31.1, < 2.0) - rubocop-rspec (3.1.0) + rubocop-rspec (3.2.0) rubocop (~> 1.61) rubocop-rspec_rails (2.30.0) rubocop (~> 1.61) From dcbc248b616f60e8322e7a599e1833de990ec411 Mon Sep 17 00:00:00 2001 From: "Ben Sheldon [he/him]" Date: Sun, 10 Nov 2024 08:43:18 -0800 Subject: [PATCH 2/2] Fix linter errors --- lib/good_job/capsule_tracker.rb | 2 +- spec/app/models/good_job/job_spec.rb | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/lib/good_job/capsule_tracker.rb b/lib/good_job/capsule_tracker.rb index 66065282..662cd81a 100644 --- a/lib/good_job/capsule_tracker.rb +++ b/lib/good_job/capsule_tracker.rb @@ -144,7 +144,7 @@ def renew(silent: false) # Tests whether an active advisory lock has been taken on the record. # @return [Boolean] def advisory_locked? - @advisory_locked_connection&.weakref_alive? && @advisory_locked_connection&.active? + @advisory_locked_connection&.weakref_alive? && @advisory_locked_connection.active? end # @!visibility private diff --git a/spec/app/models/good_job/job_spec.rb b/spec/app/models/good_job/job_spec.rb index 22b655de..4e49e0f2 100644 --- a/spec/app/models/good_job/job_spec.rb +++ b/spec/app/models/good_job/job_spec.rb @@ -732,8 +732,6 @@ def job_params next if rescue_with_handler(e) raise e - ensure - nil end end