Merge pull request #1534 from alphagov/dependabot/bundler/rubocop-govuk-5.2.0

Bump rubocop-govuk from 5.1.20 to 5.2.0

Author: TonyGDS

Gemfile.lock

@@ -499,7 +499,7 @@ GEM
       opentelemetry-api (~> 1.0)
     ostruct (0.6.3)
     parallel (1.27.0)
-    parser (3.3.9.0)
+    parser (3.3.10.1)
       ast (~> 2.4.1)
       racc
     plek (5.2.2)
@@ -576,7 +576,7 @@ GEM
     redis (4.8.1)
     redis-client (0.26.4)
       connection_pool
-    regexp_parser (2.11.2)
+    regexp_parser (2.11.3)
     reline (0.6.3)
       io-console (~> 0.5)
     request_store (1.7.0)
@@ -605,31 +605,31 @@ GEM
       rspec-mocks (~> 3.13)
       rspec-support (~> 3.13)
     rspec-support (3.13.4)
-    rubocop (1.79.2)
+    rubocop (1.82.1)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 2.9.3, < 3.0)
-      rubocop-ast (>= 1.46.0, < 2.0)
+      rubocop-ast (>= 1.48.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.46.0)
+    rubocop-ast (1.49.0)
       parser (>= 3.3.7.2)
-      prism (~> 1.4)
+      prism (~> 1.7)
     rubocop-capybara (2.22.1)
       lint_roller (~> 1.1)
       rubocop (~> 1.72, >= 1.72.1)
-    rubocop-govuk (5.1.20)
-      rubocop (= 1.79.2)
-      rubocop-ast (= 1.46.0)
+    rubocop-govuk (5.2.0)
+      rubocop (= 1.82.1)
+      rubocop-ast (= 1.49.0)
       rubocop-capybara (= 2.22.1)
-      rubocop-rails (= 2.33.3)
+      rubocop-rails (= 2.34.3)
       rubocop-rake (= 0.7.1)
-      rubocop-rspec (= 3.6.0)
-    rubocop-rails (2.33.3)
+      rubocop-rspec (= 3.9.0)
+    rubocop-rails (2.34.3)
       activesupport (>= 4.2.0)
       lint_roller (~> 1.1)
       rack (>= 1.1)
@@ -638,9 +638,9 @@ GEM
     rubocop-rake (0.7.1)
       lint_roller (~> 1.1)
       rubocop (>= 1.72.1)
-    rubocop-rspec (3.6.0)
+    rubocop-rspec (3.9.0)
       lint_roller (~> 1.1)
-      rubocop (~> 1.72, >= 1.72.1)
+      rubocop (~> 1.81)
     ruby-progressbar (1.13.0)
     sass-embedded (1.77.8)
       google-protobuf (~> 4.26)
@@ -698,9 +698,9 @@ GEM
     tsort (0.2.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (3.1.5)
-      unicode-emoji (~> 4.0, >= 4.0.4)
-    unicode-emoji (4.0.4)
+    unicode-display_width (3.2.0)
+      unicode-emoji (~> 4.1)
+    unicode-emoji (4.2.0)
     uri (1.1.1)
     useragent (0.16.11)
     version_gem (1.1.8)

app/lib/commands/short_url_requests/accept.rb

@@ -14,7 +14,7 @@ def call(failure:)
 
     if redirect.update(to_path: url_request.to_path, short_url_request: url_request, override_existing: url_request.override_existing, route_type: url_request.route_type, segments_mode: url_request.segments_mode)
       url_request.update!(state: "accepted")
-      existing_request.update!(state: "superseded") if existing_request.present?
+      existing_request.presence&.update!(state: "superseded")
       RequestNotifier.email(:short_url_request_accepted, url_request).each(&:deliver_later)
     else
       failure.call

app/lib/commands/short_url_requests/update.rb

@@ -6,15 +6,11 @@ def initialize(params, url_request)
 
   def call(success:, failure:)
     if url_request.update(params)
-      if url_request.redirect.present?
-        url_request.redirect.update!(
-          from_path: url_request.from_path,
-          to_path: url_request.to_path,
-          route_type: url_request.route_type,
-          segments_mode: url_request.segments_mode,
-          override_existing: url_request.override_existing,
-        )
-      end
+      url_request.redirect.presence&.update!(from_path: url_request.from_path,
+                                             to_path: url_request.to_path,
+                                             route_type: url_request.route_type,
+                                             segments_mode: url_request.segments_mode,
+                                             override_existing: url_request.override_existing)
 
       success.call
     else