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) 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) 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