From 3fe6ecb11574665859212a9cb121f5659811c878 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 17 Jan 2025 20:51:01 +0000 Subject: [PATCH 1/2] Bump rubocop-govuk from 5.0.7 to 5.0.8 Bumps [rubocop-govuk](https://github.com/alphagov/rubocop-govuk) from 5.0.7 to 5.0.8. - [Changelog](https://github.com/alphagov/rubocop-govuk/blob/main/CHANGELOG.md) - [Commits](https://github.com/alphagov/rubocop-govuk/compare/v5.0.7...v5.0.8) --- updated-dependencies: - dependency-name: rubocop-govuk dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index acb60e050..817813316 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -522,7 +522,7 @@ GEM opentelemetry-api (~> 1.0) ostruct (0.6.1) parallel (1.26.3) - parser (3.3.6.0) + parser (3.3.7.0) ast (~> 2.4.1) racc plek (5.2.0) @@ -622,7 +622,7 @@ GEM rspec-mocks (~> 3.13) rspec-support (~> 3.13) rspec-support (3.13.1) - rubocop (1.69.2) + rubocop (1.70.0) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) @@ -636,8 +636,8 @@ GEM parser (>= 3.3.1.0) rubocop-capybara (2.21.0) rubocop (~> 1.41) - rubocop-govuk (5.0.7) - rubocop (= 1.69.2) + rubocop-govuk (5.0.8) + rubocop (= 1.70.0) rubocop-ast (= 1.37.0) rubocop-capybara (= 2.21.0) rubocop-rails (= 2.28.0) @@ -710,7 +710,7 @@ GEM timeout (0.4.3) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - unicode-display_width (3.1.3) + unicode-display_width (3.1.4) unicode-emoji (~> 4.0, >= 4.0.4) unicode-emoji (4.0.4) uri (0.13.0) From 38f9e19d7f6769ff0ff65959fa5ad6ae75f7738a Mon Sep 17 00:00:00 2001 From: davidtrussler Date: Wed, 29 Jan 2025 11:59:05 +0000 Subject: [PATCH 2/2] Fix rubocop offences for new version --- app/validators/status_prerequisite_validator.rb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/app/validators/status_prerequisite_validator.rb b/app/validators/status_prerequisite_validator.rb index ff0c6a080..15d32f892 100644 --- a/app/validators/status_prerequisite_validator.rb +++ b/app/validators/status_prerequisite_validator.rb @@ -30,10 +30,8 @@ def validate_each(record, attribute, value) def can_be_in_review?(record) record.has_draft? && record.reviewer_id.present? && - ( - record.status_was == "submitted_for_2i" || - record.status_was == "in_review" - ) + + %w[submitted_for_2i in_review].include?(record.status_was) end def can_be_scheduled?(record)