Merge branch 'main' into CDPTKAN-763-software-updates-factory_bot_rails

Author: ripan

Gemfile

@@ -64,7 +64,7 @@ group :development do
   gem 'binding_of_caller'
   gem 'listen', '~> 3.8'
   gem 'rubocop'
-  gem 'rubocop-govuk', '~> 5.1.1'
+  gem 'rubocop-govuk', '~> 5.2.0'
   gem 'ruby-lsp'
   gem 'spring'
   gem 'spring-watcher-listen', '~> 2.1.0'

Gemfile.lock

@@ -675,31 +675,31 @@ GEM
     rspec-support (3.13.2)
     rspec_junit_formatter (0.6.0)
       rspec-core (>= 2, < 4, != 2.12.0)
-    rubocop (1.79.2)
+    rubocop (1.86.0)
       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.49.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.46.0)
+    rubocop-ast (1.49.1)
       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.1)
+      rubocop (= 1.86.0)
+      rubocop-ast (= 1.49.1)
       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)
@@ -708,9 +708,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-lsp (0.26.9)
       language_server-protocol (~> 3.17.0)
       prism (>= 1.2, < 2.0)
@@ -873,7 +873,7 @@ DEPENDENCIES
   rspec-rails
   rspec_junit_formatter
   rubocop
-  rubocop-govuk (~> 5.1.1)
+  rubocop-govuk (~> 5.2.0)
   ruby-lsp
   sass-rails (>= 6)
   selenium-webdriver (= 4.15.0)

app/controllers/admin/services_controller.rb

@@ -159,12 +159,14 @@ def approve
         approval.value = '1'
         approval.save!
       end
+      # rubocop:disable Rails/Presence
       if revoke.present?
         revoke.delete
       end
       if awaiting.present?
         awaiting.delete
       end
+      # rubocop:enable Rails/Presence
 
       if unpublish_review_service(service_id)
         flash[:success] = 'Service approved for go live - queueing for unpublish'
@@ -198,12 +200,14 @@ def revoke_approval
         revoke.value = '1'
         revoke.save!
       end
+      # rubocop:disable Rails/Presence
       if approval.present?
         approval.delete
       end
       if awaiting.present?
         awaiting.delete
       end
+      # rubocop:enable Rails/Presence
 
       if unpublish_review_service(service_id)
         flash[:success] = 'Service requires changes - queueing for unpublish'

app/helpers/moj_forms_components_helper.rb

@@ -7,7 +7,7 @@ module MojFormsComponentsHelper
     define_method(name) do |*args, **kwargs, &block|
       capture do
         render(klass.constantize.new(*args, **kwargs)) do |com|
-          block.call(com) if block.present?
+          block.call(com) if block.present? # rubocop:disable Rails/Presence
         end
       end
     end

app/services/publish_service_creation.rb

@@ -59,7 +59,7 @@ def service_configuration(name:, deployment_environment:)
       name: name.to_s.upcase
     )
 
-    configuration.decrypt_value if configuration.present?
+    configuration.decrypt_value if configuration.present? # rubocop:disable Rails/Presence
   end
 
   def existing_authentication?(deployment_environment:)

spec/generators/new_flow_branch_generator_spec.rb

@@ -35,17 +35,19 @@
             'next' => {
               'default' => 'default-next-uuid',
               'conditionals' => [
-                '_uuid' => 'you-can-do-it',
-                '_type' => 'if',
-                'next' => 'another-page-uuid',
-                'expressions' => [
-                  {
-                    'operator' => 'is',
-                    'page' => 'expression-page-uuid',
-                    'component' => 'component-uuid',
-                    'field' => 'field-uuid'
-                  }
-                ]
+                {
+                  '_uuid' => 'you-can-do-it',
+                  '_type' => 'if',
+                  'next' => 'another-page-uuid',
+                  'expressions' => [
+                    {
+                      'operator' => 'is',
+                      'page' => 'expression-page-uuid',
+                      'component' => 'component-uuid',
+                      'field' => 'field-uuid'
+                    }
+                  ]
+                }
               ]
             }
           }

spec/services/page_updater_spec.rb

@@ -315,24 +315,26 @@ def find_page_uuid(url, meta)
       let(:attributes_to_update) do
         {
           'components' => [
-            '_uuid' => 'ac41be35-914e-4b22-8683-f5477716b7d4',
-            'items' => [
-              {
-                '_uuid' => ''
-              },
-              {
-                '_uuid' => ''
-              },
-              {
-                '_uuid' => ''
-              },
-              {
-                '_uuid' => nil
-              },
-              {
-                '_uuid' => nil
-              }
-            ]
+            {
+              '_uuid' => 'ac41be35-914e-4b22-8683-f5477716b7d4',
+              'items' => [
+                {
+                  '_uuid' => ''
+                },
+                {
+                  '_uuid' => ''
+                },
+                {
+                  '_uuid' => ''
+                },
+                {
+                  '_uuid' => nil
+                },
+                {
+                  '_uuid' => nil
+                }
+              ]
+            }
           ]
         }.stringify_keys
       end
@@ -387,24 +389,26 @@ def find_page_uuid(url, meta)
       let(:attributes_to_update) do
         {
           'components' => [
-            '_uuid' => 'ac41be35-914e-4b22-8683-f5477716b7d4',
-            'items' => [
-              {
-                '_uuid' => 'c5571937-9388-4411-b5fa-34ddf9bc4ca0'
-              },
-              {
-                '_uuid' => '67160ff1-6f7c-43a8-8bf6-49b3d5f450f6'
-              },
-              {
-                '_uuid' => 'ac41be35-914e-4b22-8683-f5477716b7d4'
-              },
-              {
-                '_uuid' => 'ac41be35-914e-4b22-8683-f5477716b7d4'
-              },
-              {
-                '_uuid' => 'ac41be35-914e-4b22-8683-f5477716b7d4'
-              }
-            ]
+            {
+              '_uuid' => 'ac41be35-914e-4b22-8683-f5477716b7d4',
+              'items' => [
+                {
+                  '_uuid' => 'c5571937-9388-4411-b5fa-34ddf9bc4ca0'
+                },
+                {
+                  '_uuid' => '67160ff1-6f7c-43a8-8bf6-49b3d5f450f6'
+                },
+                {
+                  '_uuid' => 'ac41be35-914e-4b22-8683-f5477716b7d4'
+                },
+                {
+                  '_uuid' => 'ac41be35-914e-4b22-8683-f5477716b7d4'
+                },
+                {
+                  '_uuid' => 'ac41be35-914e-4b22-8683-f5477716b7d4'
+                }
+              ]
+            }
           ]
         }.stringify_keys
       end