Merge pull request #642 from trade-tariff/dependabot/bundler/rubocop-…

…govuk-4.11.0 Bump rubocop-govuk from 4.10.0 to 4.11.0
trade-tariff · Jul 5, 2023 · a77328e · a77328e
2 parents 2053211 + 7ab222b
commit a77328e
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 18 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -174,6 +174,7 @@ GEM
     json (2.6.3)
     kramdown (2.4.0)
       rexml
+    language_server-protocol (3.17.0.3)
     listen (3.8.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
@@ -217,9 +218,10 @@ GEM
     nokogiri (1.15.2)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    parallel (1.22.1)
-    parser (3.2.1.1)
+    parallel (1.23.0)
+    parser (3.2.2.3)
       ast (~> 2.4.1)
+      racc
     plek (5.0.0)
     prometheus_exporter (2.0.8)
       webrick
@@ -277,7 +279,7 @@ GEM
     rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    regexp_parser (2.7.0)
+    regexp_parser (2.8.1)
     request_store (1.5.1)
       rack (>= 1.4)
     rexml (3.2.5)
@@ -302,35 +304,39 @@ GEM
     rspec-support (3.12.1)
     rspec_junit_formatter (0.6.0)
       rspec-core (>= 2, < 4, != 2.12.0)
-    rubocop (1.44.1)
+    rubocop (1.53.1)
       json (~> 2.3)
+      language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 3.2.0.0)
+      parser (>= 3.2.2.3)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.24.1, < 2.0)
+      rubocop-ast (>= 1.28.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.24.1)
-      parser (>= 3.1.1.0)
-    rubocop-capybara (2.17.1)
+    rubocop-ast (1.29.0)
+      parser (>= 3.2.1.0)
+    rubocop-capybara (2.18.0)
       rubocop (~> 1.41)
-    rubocop-govuk (4.10.0)
-      rubocop (= 1.44.1)
-      rubocop-ast (= 1.24.1)
-      rubocop-rails (= 2.17.4)
+    rubocop-factory_bot (2.23.1)
+      rubocop (~> 1.33)
+    rubocop-govuk (4.11.0)
+      rubocop (= 1.53.1)
+      rubocop-ast (= 1.29.0)
+      rubocop-rails (= 2.20.2)
       rubocop-rake (= 0.6.0)
-      rubocop-rspec (= 2.18.1)
-    rubocop-rails (2.17.4)
+      rubocop-rspec (= 2.22.0)
+    rubocop-rails (2.20.2)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 1.33.0, < 2.0)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-    rubocop-rspec (2.18.1)
+    rubocop-rspec (2.22.0)
       rubocop (~> 1.33)
       rubocop-capybara (~> 2.17)
+      rubocop-factory_bot (~> 2.22)
     ruby-progressbar (1.13.0)
     ruby2_keywords (0.0.5)
     sanitize (6.0.1)

diff --git a/app/models/api/measure_type.rb b/app/models/api/measure_type.rb
@@ -66,7 +66,7 @@ def additional_duty_option
     end
 
     def self.supported_option_category?(category)
-      TYPE_OPTION_MAPPING.values.any? { |option_klass| option_klass::CATEGORY == category }
+      TYPE_OPTION_MAPPING.values.any? { |option_klass| category == option_klass::CATEGORY }
     end
   end
 end
diff --git a/spec/support/fake_uk_http.rb b/spec/support/fake_uk_http.rb
@@ -18,7 +18,7 @@ def config
   private
 
   def read(fixture)
-    fixture_path = "#{::Rails.root}/spec/fixtures/#{@service}"
+    fixture_path = Rails.root.join("spec/fixtures/#{@service}").to_s
     path = File.join(fixture_path, fixture)
 
     File.read(path)