Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(deps-dev): bump rubocop from 1.62.1 to 1.63.0 #12349

Merged
merged 3 commits into from
Apr 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
6 changes: 2 additions & 4 deletions lib/reporting/report_rows_builder.rb
Original file line number Diff line number Diff line change
Expand Up @@ -78,12 +78,11 @@ def build_tree(datas, remaining_rules)
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],
Expand All @@ -92,7 +91,6 @@ def group_and_sort(rule, remaining_rules, datas)
data: build_tree(group_datas, remaining_rules)
}
end
result
end

def group_data_with_rule(datas, rule)
Expand Down
8 changes: 2 additions & 6 deletions spec/controllers/api/v0/reports/packing_report_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -53,13 +53,9 @@
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)
Expand Down
1 change: 0 additions & 1 deletion spec/system/admin/order_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -952,7 +952,6 @@ def new_order_with_distribution(distributor, order_cycle)
}.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
Expand Down
Loading