Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.
Ruby b2b-commercee-commerceecommerceecommerce-apiecommerce-frameworkecommerce-platformheadlessheadless-commerceheadless-ecommercemarketplacemulti-tenantmulti-vendormulti-vendor-ecommerceopen-sourcespree-commerce
Improve flatpickr_capybara spec helper file.
Matthew Kennedyfe322aa3c2e8
diff --git a/backend/spec/spec_helper.rb b/backend/spec/spec_helper.rbindex 36ca175514..c69c3f4761 100644--- a/backend/spec/spec_helper.rb+++ b/backend/spec/spec_helper.rb@@ -106,6 +106,7 @@ RSpec.configure do |config|config.include Spree::TestingSupport::ControllerRequests, type: :controllerconfig.include Spree::TestingSupport::Flashconfig.include Spree::TestingSupport::ImageHelpers+ config.include Spree::TestingSupport::FlatpickrCapybaraconfig.include Spree::Core::ControllerHelpers::StrongParameters, type: :controllerdiff --git a/core/lib/spree/testing_support/flatpickr_capybara.rb b/core/lib/spree/testing_support/flatpickr_capybara.rbindex e9900e019b..f255566ff0 100644--- a/core/lib/spree/testing_support/flatpickr_capybara.rb+++ b/core/lib/spree/testing_support/flatpickr_capybara.rb@@ -1,93 +1,101 @@-def fill_in_date_manually(label_text, with:)- with_open_flatpickr(label_text) do |field|- fill_in field[:id], with: with- end-end+module Spree+ module TestingSupport+ module FlatpickrCapybara+ def fill_in_date_manually(label_text, with:)+ with_open_flatpickr(label_text) do |field|+ fill_in field[:id], with: with+ end+ end-def fill_in_date_picker(label_text, with:)- within_open_flatpickr(label_text) do- within_flatpickr_months do- fill_in_flatpickr_year(with.split('-')[0])+ def fill_in_date_picker(label_text, with:)+ within_open_flatpickr(label_text) do+ within_flatpickr_months do+ fill_in_flatpickr_year(with.split('-')[0])- select_flatpickr_month(with.split('-')[1])+ select_flatpickr_month(with.split('-')[1])- click_on_flatpickr_day(with.split('-')[2])- end- end-end+ click_on_flatpickr_day(with.split('-')[2])+ end+ end+ end-def fill_in_date_time_picker(label_text, with:)- within_open_flatpickr(label_text) do- within_flatpickr_months do- fill_in_flatpickr_year(with.split('-')[0])+ def fill_in_date_time_picker(label_text, with:)+ within_open_flatpickr(label_text) do+ within_flatpickr_months do+ fill_in_flatpickr_year(with.split('-')[0])- select_flatpickr_month(with.split('-')[1])+ select_flatpickr_month(with.split('-')[1])- click_on_flatpickr_day(with.split('-')[2])- end+ click_on_flatpickr_day(with.split('-')[2])+ end- within_flatpickr_time do- select_flatpickr_hour(with.split('-')[3])+ within_flatpickr_time do+ select_flatpickr_hour(with.split('-')[3])- select_flatpickr_min(with.split('-')[4])- end- end-end+ select_flatpickr_min(with.split('-')[4])+ end+ end+ end-def with_open_flatpickr(label_text)- field_label = find_field(id: label_text, type: :hidden)+ def fill_in_date_with_js(label_text, with:)+ date_field = find("input[id='#{label_text}']")+ script = "document.querySelector('#{date_field}').flatpickr().setDate('#{with}');"- date_field = field_label.sibling('.input')- date_field.click # Open the widget+ page.execute_script(script)+ end- yield(date_field)+ private- date_field.send_keys :tab # Close the date picker widget-end+ def with_open_flatpickr(label_text)+ field_label = find_field(id: label_text, type: :hidden)-def within_open_flatpickr(label_text)- with_open_flatpickr(label_text) do- within find(:xpath, "/html/body/div[contains(@class, 'flatpickr-calendar')]") { yield }- end-end+ date_field = field_label.sibling('.input')+ date_field.click # Open the widget-def within_flatpickr_months- within find('.flatpickr-months .flatpickr-month .flatpickr-current-month') { yield }-end+ yield(date_field)-def within_flatpickr_time- within find('.flatpickr-time') { yield }-end+ date_field.send_keys :tab # Close the date picker widget+ end-def select_flatpickr_month(month)- find("select.flatpickr-monthDropdown-months > option:nth-child(#{month.to_i})").select_option-end+ def within_open_flatpickr(label_text)+ with_open_flatpickr(label_text) do+ within find(:xpath, "/html/body/div[contains(@class, 'flatpickr-calendar')]") { yield }+ end+ end-def fill_in_flatpickr_year(year)- find('input.cur-year').set(year)-end+ def within_flatpickr_months+ within find('.flatpickr-months .flatpickr-month .flatpickr-current-month') { yield }+ end-def click_on_flatpickr_day(day)- within_flatpickr_days do- find('span', text: day).click- end-end+ def within_flatpickr_time+ within find('.flatpickr-time') { yield }+ end-def within_flatpickr_days- within find('.flatpickr-innerContainer > .flatpickr-rContainer > .flatpickr-days') { yield }-end+ def select_flatpickr_month(month)+ find("select.flatpickr-monthDropdown-months > option:nth-child(#{month.to_i})").select_option+ end-def fill_in_date_with_js(label_text, with:)- date_field = find("input[id='#{label_text}']")- script = "document.querySelector('#{date_field}').flatpickr().setDate('#{with}');"+ def fill_in_flatpickr_year(year)+ find('input.cur-year').set(year)+ end- page.execute_script(script)-end+ def click_on_flatpickr_day(day)+ within_flatpickr_days do+ find('span', text: day).click+ end+ end-def select_flatpickr_hour(hour)- find('input.flatpickr-hour').set(hour)-end+ def within_flatpickr_days+ within find('.flatpickr-innerContainer > .flatpickr-rContainer > .flatpickr-days') { yield }+ end-def select_flatpickr_min(min)- find('input.flatpickr-minute').set(min)+ def select_flatpickr_hour(hour)+ find('input.flatpickr-hour').set(hour)+ end++ def select_flatpickr_min(min)+ find('input.flatpickr-minute').set(min)+ end+ end+ endend