Skip to content

armgit / spree

Public Imported from GitHub
0

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.

Fix Ambiguous span tag containing 24 causing promotion fail. (#11218)

Matthew Kennedya18e1b12ab23
diff --git a/core/lib/spree/testing_support/flatpickr_capybara.rb b/core/lib/spree/testing_support/flatpickr_capybara.rb
index 4f6b6ea3b8..858978e9c3 100644
--- a/core/lib/spree/testing_support/flatpickr_capybara.rb
+++ b/core/lib/spree/testing_support/flatpickr_capybara.rb
@@ -59,7 +59,7 @@ module Spree
def within_open_flatpickr(label_text, &block)
with_open_flatpickr(label_text) do
- within find(:xpath, "/html/body/div[contains(@class, 'flatpickr-calendar')]", &block)
+ within find(:xpath, "/html/body/div[contains(@class, 'flatpickr-calendar') and contains(@class, 'open')]", &block)
end
end
@@ -81,12 +81,12 @@ module Spree
def click_on_flatpickr_day(day)
within_flatpickr_days do
- find('span', text: day).click
+ find('.flatpickr-day:not(.prevMonthDay):not(.nextMonthDay)', text: day).click
end
end
def within_flatpickr_days(&block)
- within find('.flatpickr-innerContainer > .flatpickr-rContainer > .flatpickr-days', &block)
+ within find('.flatpickr-innerContainer > .flatpickr-rContainer > .flatpickr-days > .dayContainer', &block)
end
def select_flatpickr_hour(hour)