From f9afc0ba96856cd28d2c1720f4ad19781c363206 Mon Sep 17 00:00:00 2001 From: Gaetan Craig-Riou Date: Fri, 21 Jul 2023 14:21:57 +1000 Subject: [PATCH] Fix rubocop warning --- app/controllers/admin/reports_controller.rb | 2 +- lib/reporting/line_items.rb | 4 ++-- spec/system/admin/reports/orders_and_fulfillment_spec.rb | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/controllers/admin/reports_controller.rb b/app/controllers/admin/reports_controller.rb index cd66e3d8c2..ac3adec7f8 100644 --- a/app/controllers/admin/reports_controller.rb +++ b/app/controllers/admin/reports_controller.rb @@ -56,7 +56,7 @@ module Admin @rendering_options = rendering_options @data = Reporting::FrontendData.new(spree_current_user) - variant_id_in = params[:variant_id_in]&.reject(&:blank?) + variant_id_in = params[:variant_id_in]&.compact_blank load_selected_variant if variant_id_in.present? end diff --git a/lib/reporting/line_items.rb b/lib/reporting/line_items.rb index 87afa58a64..a949e02dce 100644 --- a/lib/reporting/line_items.rb +++ b/lib/reporting/line_items.rb @@ -24,9 +24,9 @@ module Reporting end # Filter by product - variant_id_in = @params[:variant_id_in].reject(&:blank?) + variant_id_in = @params[:variant_id_in]&.compact_blank if variant_id_in.present? - line_items = line_items.where("spree_line_items.variant_id": variant_id_in) + line_items = line_items.where('spree_line_items.variant_id': variant_id_in) end if line_item_includes.present? diff --git a/spec/system/admin/reports/orders_and_fulfillment_spec.rb b/spec/system/admin/reports/orders_and_fulfillment_spec.rb index 05d44ca27a..97dcc5cc11 100644 --- a/spec/system/admin/reports/orders_and_fulfillment_spec.rb +++ b/spec/system/admin/reports/orders_and_fulfillment_spec.rb @@ -179,7 +179,7 @@ describe "Orders And Fulfillment" do context "When filtering by product" do let(:variant1) { create(:variant, product: product, unit_description: "Big") } - let(:variant3) { create(:variant)} + let(:variant3) { create(:variant) } before do create(:line_item_with_shipment, variant: variant1, quantity: 1, order: order1)