Merge pull request #3450 from DFE-Digital/dependabot/bundler/standard…

…-1.42.1 Bump standard from 1.40.1 to 1.42.1
DFE-Digital · Dec 3, 2024 · f1c7841 · f1c7841
2 parents 6340595 + 1d507cd
commit f1c7841
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 22 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -291,7 +291,7 @@ GEM
     jbuilder (2.13.0)
       actionview (>= 5.0.0)
       activesupport (>= 5.0.0)
-    json (2.7.2)
+    json (2.9.0)
     json-jwt (1.15.3.1)
       activesupport (>= 4.2)
       aes_key_wrap
@@ -588,7 +588,7 @@ GEM
     parallel (1.26.3)
     parallel_tests (4.7.1)
       parallel
-    parser (3.3.5.0)
+    parser (3.3.6.0)
       ast (~> 2.4.1)
       racc
     pg (1.5.7)
@@ -670,7 +670,7 @@ GEM
       ffi (~> 1.0)
     rdoc (6.8.1)
       psych (>= 4.0.0)
-    regexp_parser (2.9.2)
+    regexp_parser (2.9.3)
     reline (0.5.12)
       io-console (~> 0.5)
     representable (3.2.0)
@@ -709,20 +709,19 @@ GEM
     rspec-retry (0.6.2)
       rspec-core (> 3.3)
     rspec-support (3.13.1)
-    rubocop (1.65.1)
+    rubocop (1.68.0)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 2.4, < 3.0)
-      rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.31.1, < 2.0)
+      rubocop-ast (>= 1.32.2, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.32.3)
+    rubocop-ast (1.36.2)
       parser (>= 3.3.1.0)
-    rubocop-performance (1.21.1)
+    rubocop-performance (1.22.1)
       rubocop (>= 1.48.1, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
     ruby-progressbar (1.13.0)
@@ -777,18 +776,18 @@ GEM
       actionpack (>= 5.2)
       activesupport (>= 5.2)
       sprockets (>= 3.0.0)
-    standard (1.40.1)
+    standard (1.42.1)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.0)
-      rubocop (~> 1.65.0)
+      rubocop (~> 1.68.0)
       standard-custom (~> 1.0.0)
-      standard-performance (~> 1.4)
+      standard-performance (~> 1.5)
     standard-custom (1.0.2)
       lint_roller (~> 1.0)
       rubocop (~> 1.50)
-    standard-performance (1.4.0)
+    standard-performance (1.5.0)
       lint_roller (~> 1.1)
-      rubocop-performance (~> 1.21.0)
+      rubocop-performance (~> 1.22.0)
     statsd-ruby (1.5.0)
     stringio (3.1.2)
     swd (1.3.0)

diff --git a/lib/csv_importer/base.rb b/lib/csv_importer/base.rb
@@ -60,7 +60,7 @@ def delete_all_scope
     end
 
     def with_headers?
-      parse_headers && mandatory_headers&.is_a?(Array) && mandatory_headers&.any?
+      parse_headers && mandatory_headers&.is_a?(Array) && mandatory_headers.any?
     end
 
     def check_headers

diff --git a/spec/models/payment_confirmation_upload_spec.rb b/spec/models/payment_confirmation_upload_spec.rb
@@ -90,10 +90,10 @@
             gross_value: "487.48".to_d,
             national_insurance: "33.9".to_d,
             employers_national_insurance: "38.98".to_d,
-            student_loan_repayment: "0".to_d,
-            postgraduate_loan_repayment: "0".to_d,
+            student_loan_repayment: 0.to_d,
+            postgraduate_loan_repayment: 0.to_d,
             tax: "89.6".to_d,
-            net_pay: "325".to_d,
+            net_pay: 325.to_d,
             gross_pay: "448.5".to_d
           )
 
@@ -102,10 +102,10 @@
             gross_value: "904.15".to_d,
             national_insurance: "77.84".to_d,
             employers_national_insurance: "89.51".to_d,
-            student_loan_repayment: "40".to_d,
-            postgraduate_loan_repayment: "0".to_d,
+            student_loan_repayment: 40.to_d,
+            postgraduate_loan_repayment: 0.to_d,
             tax: "162.8".to_d,
-            net_pay: "534".to_d,
+            net_pay: 534.to_d,
             gross_pay: "814.64".to_d
           )
 
@@ -114,9 +114,9 @@
             gross_value: "11_027.46".to_d,
             national_insurance: "268.84".to_d,
             employers_national_insurance: "1316.63".to_d,
-            student_loan_repayment: "839".to_d,
+            student_loan_repayment: 839.to_d,
             postgraduate_loan_repayment: "9710.83".to_d,
-            tax: "1942".to_d,
+            tax: 1942.to_d,
             net_pay: "6660.99".to_d,
             gross_pay: "9710.83".to_d
           )