From 6c431d405256ea3696a24aba4b848a1045f4be18 Mon Sep 17 00:00:00 2001 From: Maikel Linke Date: Thu, 17 Oct 2024 15:01:21 +1100 Subject: [PATCH] Fixup specs to use the new datepicker tools --- spec/support/features/datepicker_helper.rb | 6 ++++ spec/system/admin/order_cycles/edit_spec.rb | 35 ++++++--------------- spec/system/admin/order_cycles/list_spec.rb | 22 ++++--------- 3 files changed, 22 insertions(+), 41 deletions(-) diff --git a/spec/support/features/datepicker_helper.rb b/spec/support/features/datepicker_helper.rb index 7222fa3c0e..74444316a5 100644 --- a/spec/support/features/datepicker_helper.rb +++ b/spec/support/features/datepicker_helper.rb @@ -43,5 +43,11 @@ module Features select_datetime_from_datepicker datetime_selector find("body").send_keys(:escape) end + + def close_datepicker + within(".flatpickr-calendar.open") do + click_button "Close" + end + end end end diff --git a/spec/system/admin/order_cycles/edit_spec.rb b/spec/system/admin/order_cycles/edit_spec.rb index adb91dee0e..f6223edfad 100644 --- a/spec/system/admin/order_cycles/edit_spec.rb +++ b/spec/system/admin/order_cycles/edit_spec.rb @@ -41,11 +41,8 @@ RSpec.describe ' # change date range field value find('#order_cycle_orders_close_at').click - within(".flatpickr-calendar.open") do - expect(page).to have_selector '.shortcut-buttons-flatpickr-buttons' - select_datetime_from_datepicker Time.zone.parse("2024-03-30 00:00") - find("button", text: "Close").click - end + select_datetime_from_datepicker Time.zone.parse("2024-03-30 00:00") + close_datepicker expect(page).to have_content('You have unsaved changes') # click save to open warning modal @@ -66,11 +63,8 @@ RSpec.describe ' # change date range field value find('#order_cycle_orders_close_at').click - within(".flatpickr-calendar.open") do - expect(page).to have_selector '.shortcut-buttons-flatpickr-buttons' - select_datetime_from_datepicker Time.zone.parse("2024-03-30 00:00") - find("button", text: "Close").click - end + select_datetime_from_datepicker Time.zone.parse("2024-03-30 00:00") + close_datepicker # click save to open warning modal click_button('Save') @@ -102,11 +96,8 @@ RSpec.describe ' # Now change date range field value find('#order_cycle_orders_close_at').click - within(".flatpickr-calendar.open") do - expect(page).to have_selector '.shortcut-buttons-flatpickr-buttons' - select_datetime_from_datepicker Time.zone.parse("2024-03-30 00:00") - find("button", text: "Close").click - end + select_datetime_from_datepicker Time.zone.parse("2024-03-30 00:00") + close_datepicker expect(page).to have_content('You have unsaved changes') click_button('Save') @@ -137,11 +128,8 @@ RSpec.describe ' # change date range field value find('#order_cycle_orders_close_at').click - within(".flatpickr-calendar.open") do - expect(page).to have_selector '.shortcut-buttons-flatpickr-buttons' - select_datetime_from_datepicker Time.zone.parse("2024-03-30 00:00") - find("button", text: "Close").click - end + select_datetime_from_datepicker Time.zone.parse("2024-03-30 00:00") + close_datepicker expect(page).to have_content('You have unsaved changes') @@ -175,11 +163,8 @@ RSpec.describe ' # Now change date range field value find('#order_cycle_orders_close_at').click - within(".flatpickr-calendar.open") do - expect(page).to have_selector '.shortcut-buttons-flatpickr-buttons' - select_datetime_from_datepicker Time.zone.parse("2024-03-30 00:00") - find("button", text: "Close").click - end + select_datetime_from_datepicker Time.zone.parse("2024-03-30 00:00") + close_datepicker expect(page).to have_content('You have unsaved changes') sleep(2) diff --git a/spec/system/admin/order_cycles/list_spec.rb b/spec/system/admin/order_cycles/list_spec.rb index 0d16945a79..6e4b7fd22c 100644 --- a/spec/system/admin/order_cycles/list_spec.rb +++ b/spec/system/admin/order_cycles/list_spec.rb @@ -182,12 +182,8 @@ RSpec.describe ' find('input.datetimepicker', match: :first).click end - # Sets the value to test_value then looks for the close button and click it - within(".flatpickr-calendar.open") do - expect(page).to have_selector '.shortcut-buttons-flatpickr-buttons' - select_datetime_from_datepicker test_value - find("button", text: "Close").click - end + select_datetime_from_datepicker test_value + close_datepicker # Should no more have opened flatpickr expect(page).not_to have_selector '.flatpickr-calendar.open' @@ -213,11 +209,8 @@ RSpec.describe ' within("tr.order-cycle-#{order_cycle.id}") do find('input.datetimepicker', match: :first).click end - within(".flatpickr-calendar.open") do - expect(page).to have_selector '.shortcut-buttons-flatpickr-buttons' - select_datetime_from_datepicker Time.zone.parse("2024-03-30 00:00") - find("button", text: "Close").click - end + select_datetime_from_datepicker Time.zone.parse("2024-03-30 00:00") + close_datepicker expect(page).to have_content('You have unsaved changes') # click save to open warning modal @@ -237,11 +230,8 @@ RSpec.describe ' within("tr.order-cycle-#{order_cycle.id}") do find('input.datetimepicker', match: :first).click end - within(".flatpickr-calendar.open") do - expect(page).to have_selector '.shortcut-buttons-flatpickr-buttons' - select_datetime_from_datepicker Time.zone.parse("2024-03-30 00:00") - find("button", text: "Close").click - end + select_datetime_from_datepicker Time.zone.parse("2024-03-30 00:00") + close_datepicker expect(page).to have_content('You have unsaved changes') click_button('Save')