From 07ba9c737a544b0efb26f7cdc60e4822817066da Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 27 Feb 2025 02:45:13 +0000 Subject: [PATCH 1/2] Bump rubocop from 1.72.2 to 1.73.0 Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.72.2 to 1.73.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.72.2...v1.73.0) --- updated-dependencies: - dependency-name: rubocop dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 5da9b146ce8..c642e87ccf6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -655,7 +655,7 @@ GEM rspec-support (3.13.2) rspec_junit_formatter (0.6.0) rspec-core (>= 2, < 4, != 2.12.0) - rubocop (1.72.2) + rubocop (1.73.0) json (~> 2.3) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.1.0) @@ -666,7 +666,7 @@ GEM rubocop-ast (>= 1.38.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 4.0) - rubocop-ast (1.38.0) + rubocop-ast (1.38.1) parser (>= 3.3.1.0) rubocop-capybara (2.21.0) rubocop (~> 1.41) From 9e1052c3a5ce45bb65fedf6db5a0fe9d016cc092 Mon Sep 17 00:00:00 2001 From: Avin Hurry Date: Thu, 27 Feb 2025 08:52:36 +0000 Subject: [PATCH 2/2] There has been some updates to rubocop which has affected our code Specifically: Update Style/RedundantCondition cop to detect conditional expressions where the true branch is true and suggest replacing them with a logical OR --- .../english_foreign_language/start_form.rb | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/app/forms/candidate_interface/english_foreign_language/start_form.rb b/app/forms/candidate_interface/english_foreign_language/start_form.rb index d7a1fc587b1..e9aea24d80c 100644 --- a/app/forms/candidate_interface/english_foreign_language/start_form.rb +++ b/app/forms/candidate_interface/english_foreign_language/start_form.rb @@ -14,15 +14,11 @@ def save raise_error_unless_application_form - if qualification_status == 'has_qualification' - true - else - UpdateEnglishProficiency.new( - application_form, - qualification_status:, - no_qualification_details:, - ).call - end + qualification_status == 'has_qualification' || UpdateEnglishProficiency.new( + application_form, + qualification_status:, + no_qualification_details:, + ).call end def next_path