Merge pull request #3181 from alphagov/dependabot/bundler/rubocop-gov…

…uk-5.0.9 Bump rubocop-govuk from 5.0.8 to 5.0.9
alphagov · Mar 10, 2025 · 344e178 · 344e178
2 parents 837299f + f445edc
commit 344e178
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 27 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -304,7 +304,7 @@ GEM
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
     jmespath (1.6.2)
-    json (2.9.1)
+    json (2.10.1)
     json-schema (4.3.1)
       addressable (>= 2.8)
     jsonnet (0.6.0)
@@ -315,8 +315,9 @@ GEM
       base64
     kramdown (2.5.1)
       rexml (>= 3.3.9)
-    language_server-protocol (3.17.0.3)
+    language_server-protocol (3.17.0.4)
     link_header (0.0.8)
+    lint_roller (1.1.0)
     listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
@@ -630,7 +631,7 @@ GEM
       term-ansicolor (~> 1.7)
       thor (>= 0.20, < 2.0)
     parallel (1.26.3)
-    parser (3.3.7.0)
+    parser (3.3.7.1)
       ast (~> 2.4.1)
       racc
     parslet (2.0.0)
@@ -746,36 +747,40 @@ GEM
       rspec-mocks (~> 3.13)
       rspec-support (~> 3.13)
     rspec-support (3.13.2)
-    rubocop (1.70.0)
+    rubocop (1.73.2)
       json (~> 2.3)
-      language_server-protocol (>= 3.17.0)
+      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.36.2, < 2.0)
+      rubocop-ast (>= 1.38.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.37.0)
+    rubocop-ast (1.38.1)
       parser (>= 3.3.1.0)
     rubocop-capybara (2.21.0)
       rubocop (~> 1.41)
-    rubocop-govuk (5.0.8)
-      rubocop (= 1.70.0)
-      rubocop-ast (= 1.37.0)
+    rubocop-govuk (5.0.9)
+      rubocop (= 1.73.2)
+      rubocop-ast (= 1.38.1)
       rubocop-capybara (= 2.21.0)
-      rubocop-rails (= 2.28.0)
-      rubocop-rake (= 0.6.0)
-      rubocop-rspec (= 3.3.0)
-    rubocop-rails (2.28.0)
+      rubocop-rails (= 2.30.3)
+      rubocop-rake (= 0.7.1)
+      rubocop-rspec (= 3.5.0)
+    rubocop-rails (2.30.3)
       activesupport (>= 4.2.0)
+      lint_roller (~> 1.1)
       rack (>= 1.1)
-      rubocop (>= 1.52.0, < 2.0)
-      rubocop-ast (>= 1.31.1, < 2.0)
-    rubocop-rake (0.6.0)
-      rubocop (~> 1.0)
-    rubocop-rspec (3.3.0)
-      rubocop (~> 1.61)
+      rubocop (>= 1.72.1, < 2.0)
+      rubocop-ast (>= 1.38.0, < 2.0)
+    rubocop-rake (0.7.1)
+      lint_roller (~> 1.1)
+      rubocop (>= 1.72.1)
+    rubocop-rspec (3.5.0)
+      lint_roller (~> 1.1)
+      rubocop (~> 1.72, >= 1.72.1)
     ruby-pg-extras (5.6.7)
       pg
       terminal-table

diff --git a/app/commands/v2/post_action.rb b/app/commands/v2/post_action.rb
@@ -29,7 +29,7 @@ def document
       end
 
       def draft?
-        payload[:draft].nil? ? true : payload[:draft]
+        payload[:draft].nil? || payload[:draft]
       end
 
       def edition

diff --git a/lib/schema_generator/format.rb b/lib/schema_generator/format.rb
@@ -116,12 +116,12 @@ def instructions_to_publishers
 
     def generate_publisher?
       generate_publisher = format_data.dig("generate", "publisher")
-      generate_publisher.nil? ? true : generate_publisher
+      generate_publisher.nil? || generate_publisher
     end
 
     def generate_notification?
       generate_notification = format_data.dig("generate", "notification")
-      generate_notification.nil? ? true : generate_notification
+      generate_notification.nil? || generate_notification
     end
 
     def generate_frontend?

diff --git a/spec/service_consumers/pact_helper.rb b/spec/service_consumers/pact_helper.rb
@@ -14,11 +14,9 @@
   config.include FactoryBot::Syntax::Methods
 end
 
-def url_encode(str)
-  ERB::Util.url_encode(str)
-end
-
 Pact.service_provider "Publishing API" do
+  include ERB::Util
+
   honours_pact_with "GDS API Adapters" do
     if ENV["PACT_URI"]
       pact_uri(ENV["PACT_URI"])