From 2772dd2e78e747d58adc7a2617b7d4af3d38856a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 8 Apr 2024 09:07:38 +0000
Subject: [PATCH 1/3] chore(deps-dev): bump rubocop from 1.62.1 to 1.63.0

Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.62.1 to 1.63.0.
- [Release notes](https://github.com/rubocop/rubocop/releases)
- [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop/rubocop/compare/v1.62.1...v1.63.0)

---
updated-dependencies:
- dependency-name: rubocop
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index ae4e3a15b5..263a84cc20 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -648,7 +648,7 @@ GEM
     rswag-ui (2.13.0)
       actionpack (>= 3.1, < 7.2)
       railties (>= 3.1, < 7.2)
-    rubocop (1.62.1)
+    rubocop (1.63.0)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)

From 1509066b85a1059bd68e9afbf7d3726e304f06ea Mon Sep 17 00:00:00 2001
From: Gaetan Craig-Riou <gaetan.riou@gmail.com>
Date: Tue, 9 Apr 2024 10:29:30 +1000
Subject: [PATCH 2/3] Apply new cop Style/MapIntoArray fix

---
 lib/reporting/report_rows_builder.rb                   | 6 ++----
 spec/controllers/api/v0/reports/packing_report_spec.rb | 8 ++------
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/lib/reporting/report_rows_builder.rb b/lib/reporting/report_rows_builder.rb
index f8b09488b0..4da6c969c3 100644
--- a/lib/reporting/report_rows_builder.rb
+++ b/lib/reporting/report_rows_builder.rb
@@ -78,12 +78,11 @@ module Reporting
     end
 
     def group_and_sort(rule, remaining_rules, datas)
-      result = []
       groups = group_data_with_rule(datas, rule)
       sorted_groups = sort_groups_with_rule(groups, rule)
 
-      sorted_groups.each do |group_value, group_datas|
-        result << {
+      sorted_groups.map do |group_value, group_datas|
+        {
           is_group: true,
           header: @builder.build_header(rule, group_value, group_datas),
           header_class: rule[:header_class],
@@ -92,7 +91,6 @@ module Reporting
           data: build_tree(group_datas, remaining_rules)
         }
       end
-      result
     end
 
     def group_data_with_rule(datas, rule)
diff --git a/spec/controllers/api/v0/reports/packing_report_spec.rb b/spec/controllers/api/v0/reports/packing_report_spec.rb
index 4cee3984f4..a88a26c7d0 100644
--- a/spec/controllers/api/v0/reports/packing_report_spec.rb
+++ b/spec/controllers/api/v0/reports/packing_report_spec.rb
@@ -53,13 +53,9 @@ describe Api::V0::ReportsController, type: :controller do
   private
 
   def report_output(order, user_type)
-    results = []
-
-    order.line_items.each do |line_item|
-      results << __send__("#{user_type}_report_row", line_item)
+    results = order.line_items.map do |line_item|
+      __send__("#{user_type}_report_row", line_item)
     end
-
-    results
   end
 
   def distributor_report_row(line_item)

From 103c6e7fc06f0e8c4a2e87395a2bdb5f2aa934e4 Mon Sep 17 00:00:00 2001
From: Gaetan Craig-Riou <gaetan.riou@gmail.com>
Date: Tue, 9 Apr 2024 10:30:46 +1000
Subject: [PATCH 3/3] Remove debugging line

---
 spec/system/admin/order_spec.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/spec/system/admin/order_spec.rb b/spec/system/admin/order_spec.rb
index 6462c3cda7..c5fb4bce13 100644
--- a/spec/system/admin/order_spec.rb
+++ b/spec/system/admin/order_spec.rb
@@ -952,7 +952,6 @@ describe '
             }.not_to enqueue_job(ActionMailer::MailDeliveryJob)
           end
 
-          save_screenshot('~/hello.png')
           expect(order.reload.shipped?).to be true
           expect(page).to have_text 'SHIPPED'
         end