From 023ebe1909888fe8abce14006b895196938eb6eb Mon Sep 17 00:00:00 2001 From: filipefurtad0 Date: Tue, 26 Jul 2022 14:35:27 +0100 Subject: [PATCH] Asserts on pre-filling of dates; removes manual date selection --- .../admin/reports/packing_report_spec.rb | 47 ++++++++++--------- 1 file changed, 24 insertions(+), 23 deletions(-) diff --git a/spec/system/admin/reports/packing_report_spec.rb b/spec/system/admin/reports/packing_report_spec.rb index 6a9ca50b10..489df66e78 100644 --- a/spec/system/admin/reports/packing_report_spec.rb +++ b/spec/system/admin/reports/packing_report_spec.rb @@ -32,9 +32,12 @@ describe "Packing Reports" do let(:variant2) { create(:variant, product: product1, unit_description: "Small") } let(:product2) { create(:simple_product, name: "Product 2", supplier: supplier) } + let(:open_datetime) { (Time.zone.now - 1.month).strftime("%Y-%m-%d 00:00") } + let(:close_datetime) { Time.zone.now.strftime("%Y-%m-%d 00:00") } + before do - Timecop.travel(Time.zone.local(2022, 4, 25, 14, 0, 0)) { order1.finalize! } - Timecop.travel(Time.zone.local(2022, 4, 25, 15, 0, 0)) { order2.finalize! } + order1.finalize! + order2.finalize! create(:line_item_with_shipment, variant: variant1, quantity: 1, order: order1) create(:line_item_with_shipment, variant: variant2, quantity: 3, order: order1) @@ -45,11 +48,8 @@ describe "Packing Reports" do it "displays the report" do click_link "Pack By Customer" - find('#q_order_completed_at_gt').click - select_date_from_datepicker Time.zone.at(order1.completed_at - 1.day) - - find('#q_order_completed_at_lt').click - select_date_from_datepicker Time.zone.at(order1.completed_at + 1.day) + # pre-fills with dates + check_prefilled_dates click_button 'Go' @@ -65,11 +65,9 @@ describe "Packing Reports" do it "sorts alphabetically" do click_link "Pack By Customer" - find('#q_order_completed_at_gt').click - select_date_from_datepicker Time.zone.at(order1.completed_at - 1.day) + # pre-fills with dates + check_prefilled_dates - find('#q_order_completed_at_lt').click - select_date_from_datepicker Time.zone.at(order1.completed_at + 1.day) click_button 'Go' rows = find("table.report__table").all("tr") table = rows.map { |r| r.all("th,td").map { |c| c.text.strip }[3] } @@ -87,11 +85,9 @@ describe "Packing Reports" do describe "Pack By Supplier" do it "displays the report" do click_link "Pack By Supplier" - find('#q_order_completed_at_gt').click - select_date_from_datepicker Time.zone.at(order1.completed_at - 1.day) - find('#q_order_completed_at_lt').click - select_date_from_datepicker Time.zone.at(order1.completed_at + 1.day) + # pre-fills with dates + check_prefilled_dates find(:css, "#display_summary_row").set(false) # does not include summary rows @@ -119,16 +115,18 @@ describe "Packing Reports" do let(:li1) { build(:line_item_with_shipment) } let(:li2) { build(:line_item_with_shipment) } + let(:open_datetime) { (Time.zone.now - 1.month).strftime("%Y-%m-%d 00:00") } + let(:close_datetime) { Time.zone.now.strftime("%Y-%m-%d 00:00") } + before do order.line_items << li1 order.line_items << li2 - Timecop.travel(Time.zone.local(2022, 4, 25, 14, 0, 0)) { order.finalize! } + order.finalize! login_as_admin end describe "viewing the Pack by Product report" do context "when an associated variant has been soft-deleted" do - before do li1.variant.delete visit admin_reports_path @@ -138,14 +136,10 @@ describe "Packing Reports" do it "shows line items" do select oc.name, from: "q_order_cycle_id_in" - find('#q_order_completed_at_gt').click - select_date_from_datepicker Time.zone.at(order.completed_at - 1.day) - - find('#q_order_completed_at_lt').click - select_date_from_datepicker Time.zone.at(order.completed_at + 1.day) + # pre-fills with dates + check_prefilled_dates find("button[type='submit']").click - expect(page).to have_content li1.product.name expect(page).to have_content li2.product.name end @@ -153,3 +147,10 @@ describe "Packing Reports" do end end end + +private + +def check_prefilled_dates + expect(page).to have_input "q[order_completed_at_gt]", value: open_datetime, visible: false + expect(page).to have_input "q[order_completed_at_lt]", value: close_datetime, visible: false +end