Merge pull request #12349 from openfoodfoundation/dependabot/bundler/rubocop-1.63.0

chore(deps-dev): bump rubocop from 1.62.1 to 1.63.0
This commit is contained in:
David Cook
2024-04-10 10:32:32 +10:00
committed by GitHub
4 changed files with 5 additions and 12 deletions

View File

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

View File

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

View File

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

View File

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