Merge pull request #10006 from DFE-Digital/dependabot/bundler/rubocop…

…-1.68.0

Bump rubocop from 1.67.0 to 1.68.0

Gemfile.lock

@@ -649,7 +649,7 @@ GEM
     rspec-support (3.13.1)
     rspec_junit_formatter (0.6.0)
       rspec-core (>= 2, < 4, != 2.12.0)
-    rubocop (1.67.0)
+    rubocop (1.68.0)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)

app/controllers/provider_interface/interviews/checks_controller.rb

@@ -2,7 +2,7 @@ module ProviderInterface
   module Interviews
     class ChecksController < InterviewsController
       def new
-        @wizard = InterviewWizard.new(interview_store, **interview_form_context_params.merge(current_step: 'check', action:))
+        @wizard = InterviewWizard.new(interview_store, **interview_form_context_params, current_step: 'check', action:)
         @wizard.save_state!
 
         redirect_to new_provider_interface_application_choice_interview_path if @wizard.provider.blank?

app/forms/provider_interface/offer_wizard.rb

@@ -224,7 +224,7 @@ def structured_conditions
   private
 
     def subject
-      course_option&.course&.subjects&.first || course.subjects.first
+      course_option&.course&.subjects&.first || course.subjects.first # rubocop:disable Style/SafeNavigationChainLength
     end
 
     def subject_mapping

app/models/ske_condition.rb

@@ -71,7 +71,7 @@ def length_for_ske_courses
   end
 
   def subject_code
-    subject = offer&.course_option&.course&.subjects&.first
+    subject = offer&.course_option&.course&.subjects&.first # rubocop:disable Style/SafeNavigationChainLength
     subject&.code
   end
 end

config/rubocop/config/style.yml

@@ -129,3 +129,6 @@ Style/FetchEnvVar:
 Style/RedundantLineContinuation:
   Exclude:
     - app/lib/vendor_api/changes/*
+
+Style/BitwisePredicate:
+  Enabled: false

spec/factory_specs/application_choice_factory_spec.rb

@@ -1,7 +1,7 @@
 require 'rails_helper'
 
 RSpec.describe 'ApplicationChoice factory' do
-  subject(:record) { |attrs: {}| create(factory, *traits, **attributes.merge(attrs)) }
+  subject(:record) { |attrs: {}| create(factory, *traits, **attributes, **attrs) }
 
   let(:factory) { :application_choice }
   let(:traits) { [] }

spec/factory_specs/application_form_factory_spec.rb

@@ -1,7 +1,7 @@
 require 'rails_helper'
 
 RSpec.describe 'ApplicationForm factory' do
-  subject(:record) { |attrs: {}| create(factory, *traits, **attributes.merge(attrs)) }
+  subject(:record) { |attrs: {}| create(factory, *traits, **attributes, **attrs) }
 
   let(:factory) { :application_form }
   let(:traits) { [] }

spec/factory_specs/candidate_factory_spec.rb

@@ -1,7 +1,7 @@
 require 'rails_helper'
 
 RSpec.describe 'Candidate factory' do
-  subject(:record) { |attrs: {}| create(factory, *traits, **attributes.merge(attrs)) }
+  subject(:record) { |attrs: {}| create(factory, *traits, **attributes, **attrs) }
 
   let(:traits) { [] }
   let(:attributes) { {} }

spec/factory_specs/course_factory_spec.rb

@@ -1,7 +1,7 @@
 require 'rails_helper'
 
 RSpec.describe 'Course factory' do
-  subject(:record) { |attrs: {}| create(factory, *traits, **attributes.merge(attrs)) }
+  subject(:record) { |attrs: {}| create(factory, *traits, **attributes, **attrs) }
 
   let(:traits) { [] }
   let(:attributes) { {} }

spec/factory_specs/course_option_factory_spec.rb

@@ -1,7 +1,7 @@
 require 'rails_helper'
 
 RSpec.describe 'CourseOption factory' do
-  subject(:record) { |attrs: {}| create(factory, *traits, **attributes.merge(attrs)) }
+  subject(:record) { |attrs: {}| create(factory, *traits, **attributes, **attrs) }
 
   let(:traits) { [] }
   let(:attributes) { {} }

spec/factory_specs/provider_factory_spec.rb

@@ -1,7 +1,7 @@
 require 'rails_helper'
 
 RSpec.describe 'Provider factory' do
-  subject(:record) { |attrs: {}| create(factory, *traits, **attributes.merge(attrs)) }
+  subject(:record) { |attrs: {}| create(factory, *traits, **attributes, **attrs) }
 
   let(:traits) { [] }
   let(:attributes) { {} }