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
Fix flatpickr intermittent failing tests. (#11223)
Matthew Kennedy052232fa2949
diff --git a/backend/spec/features/admin/orders/listing_spec.rb b/backend/spec/features/admin/orders/listing_spec.rbindex 65a7b43fea..9b8fc8c217 100644--- a/backend/spec/features/admin/orders/listing_spec.rb+++ b/backend/spec/features/admin/orders/listing_spec.rb@@ -3,7 +3,7 @@ require 'spec_helper'describe 'Orders Listing', type: :feature dostub_authorization!- let(:other_store) { create(:store, name: 'Other Store', url: "another-store.lvh.me") }+ let(:other_store) { create(:store, name: 'Other Store', url: 'another-store.lvh.me') }let(:order1) docreate :order_with_line_items,@@ -296,18 +296,16 @@ describe 'Orders Listing', type: :feature dofill_in 'q_bill_address_firstname_start', with: 'John'fill_in 'q_bill_address_lastname_start', with: 'Smith'select2 'spree', from: 'Channel'-- # Can not test these in the filter dropdown- # With current implementation of flatpickr test support.- # fill_in_date_picker('q_created_at_gt', with: '2018-01-01')- # fill_in_date_picker('q_created_at_lt', with: '2018-01-01')end+ fill_in_date_picker('q_created_at_gt', { year: 2018, month: 1, day: 18 })+ fill_in_date_picker('q_created_at_lt', { year: 2019, month: 3, day: 25 })+click_on 'Filter Results'within('.table-active-filters') do- # expect(page).to have_content('Start: 2018-01-01')- # expect(page).to have_content('Stop: 2018-06-30')+ expect(page).to have_content('Start: 2018-01-18')+ expect(page).to have_content('Stop: 2019-03-25')expect(page).to have_content('Order Number: R100')expect(page).to have_content('Status: cart')expect(page).to have_content('Payment State: paid')diff --git a/backend/spec/features/admin/products/products_spec.rb b/backend/spec/features/admin/products/products_spec.rbindex 9d5b1f92c3..776b020a4e 100644--- a/backend/spec/features/admin/products/products_spec.rb+++ b/backend/spec/features/admin/products/products_spec.rb@@ -176,11 +176,14 @@ describe 'Products', type: :feature dofill_in 'product_sku', with: 'B100'fill_in 'product_price', with: '100'- fill_in_date_picker('product_available_on', with: '2012-01-24')+ fill_in_date_picker('product_available_on', { year: 2012, month: 1, day: 24 })+select2 'Size', from: 'Prototype'check 'Large'select2 @shipping_category.name, css: '#product_shipping_category_field'+click_button 'Create'+expect(page).to have_content('successfully created!')expect(page).to have_field(id: 'product_available_on', type: :hidden, with: '2012-01-24')expect(Spree::Product.last.variants.length).to eq(1)diff --git a/backend/spec/features/admin/promotions/promotion_spec.rb b/backend/spec/features/admin/promotions/promotion_spec.rbindex d63379099b..67d1a30149 100644--- a/backend/spec/features/admin/promotions/promotion_spec.rb+++ b/backend/spec/features/admin/promotions/promotion_spec.rb@@ -23,17 +23,18 @@ describe 'Create New Promotion', type: :feature, js: true doendit 'Allows you to set a promotion with start and end time' do- fill_in_date_time_picker('promotion_starts_at', with: '2012-01-24-16-45')fill_in 'Name', with: 'Promotion 2'- fill_in_date_time_picker('promotion_expires_at', with: '2012-01-25-22-10')+ fill_in_date_picker('promotion_starts_at', { year: 2012, month: 1, day: 18, hour: 16, minute: 45 })+ fill_in_date_picker('promotion_expires_at', { year: 2013, month: 3, day: 25, hour: 22, minute: 10 })+fill_in 'Code', with: 'Random 2323'click_button 'Create'promotion = store.promotions.last- expect(promotion.starts_at).to eq(DateTime.new(2012, 1, 24, 16, 45))- expect(promotion.expires_at).to eq(DateTime.new(2012, 1, 25, 22, 10))+ expect(promotion.starts_at).to eq(DateTime.new(2012, 1, 18, 16, 45))+ expect(promotion.expires_at).to eq(DateTime.new(2013, 3, 25, 22, 10))endit 'allows assigning multiple stores' dodiff --git a/core/lib/spree/testing_support/flatpickr_capybara.rb b/core/lib/spree/testing_support/flatpickr_capybara.rbindex 858978e9c3..19dcb60285 100644--- a/core/lib/spree/testing_support/flatpickr_capybara.rb+++ b/core/lib/spree/testing_support/flatpickr_capybara.rb@@ -1,70 +1,83 @@module Spreemodule TestingSupportmodule FlatpickrCapybara- def fill_in_date_manually(label_text, with:)+ def fill_in_date_manually(label_text, options = {})with_open_flatpickr(label_text) do |field|- fill_in field[:id], with: with+ fill_in field[:id], with: string_date(options)endend- def fill_in_date_picker(label_text, with:)+ def fill_in_date_picker(label_text, options = {})+ if options[:hour].blank? && options[:minute].blank?+ flatpickr_date_only(label_text, options)+ else+ flatpickr_date_time(label_text, options)+ end+ end++ def fill_in_date_with_js(label_text, options = {})+ date_field = find("input[id='#{label_text}']")+ script = "document.querySelector('#{date_field}').flatpickr().setDate('#{string_date(options)}');"++ page.execute_script(script)+ end++ private++ def flatpickr_date_only(label_text, options = {})within_open_flatpickr(label_text) dowithin_flatpickr_months do- fill_in_flatpickr_year(with.split('-')[0])+ fill_in_flatpickr_year(options[:year].to_i)+ sleep(0.25) # Pause to let JavaScript adjust the month selector in the flatpickr cal in relation to any related FROM...TO cal.- select_flatpickr_month(with.split('-')[1])+ select_flatpickr_month(options[:month].to_i)+ sleep(0.25) # Pause to let JavaScript adjust the day selection area in the flatpickr cal in relation to any related FROM...TO cal.- click_on_flatpickr_day(with.split('-')[2])+ click_on_flatpickr_day(options[:day].to_i)endendend- def fill_in_date_time_picker(label_text, with:)+ def flatpickr_date_time(label_text, options = {})within_open_flatpickr(label_text) dowithin_flatpickr_months do- fill_in_flatpickr_year(with.split('-')[0])+ fill_in_flatpickr_year(options[:year].to_i)+ sleep(0.25) # Pause to let JavaScript adjust the month selector in the flatpickr cal in relation to any related FROM...TO cal.- select_flatpickr_month(with.split('-')[1])+ select_flatpickr_month(options[:month].to_i)+ sleep(0.25) # Pause to let JavaScript adjust the day selection area in the flatpickr cal in relation to any related FROM...TO cal.- click_on_flatpickr_day(with.split('-')[2])+ click_on_flatpickr_day(options[:day].to_i)endwithin_flatpickr_time do- select_flatpickr_hour(with.split('-')[3])-- select_flatpickr_min(with.split('-')[4])+ select_flatpickr_hour(options[:hour].to_i)+ select_flatpickr_min(options[:minute].to_i)endendend- def fill_in_date_with_js(label_text, with:)- date_field = find("input[id='#{label_text}']")- script = "document.querySelector('#{date_field}').flatpickr().setDate('#{with}');"-- page.execute_script(script)- end-- private-def with_open_flatpickr(label_text)field_label = find_field(id: label_text, type: :hidden)date_field = field_label.sibling('.flatpickr-alt-input')- date_field.click # Open the widget+ date_field.click # Open the flatpickr cal.+ sleep(0.25) # Pause to let JavaScript populate DOM with an open flatpickr cal.- yield(date_field)+ yield(date_field) # Complete required action within the open flatpickr cal.- date_field.send_keys :tab # Close the date picker widget+ date_field.send_keys :tab # Close the date flatpickr cal.+ sleep(0.25) # Pause to let JavaScript adjust any DOM values in relation to any related FROM...TO cal.enddef within_open_flatpickr(label_text, &block)with_open_flatpickr(label_text) do- within find(:xpath, "/html/body/div[contains(@class, 'flatpickr-calendar') and contains(@class, 'open')]", &block)+ within find('.flatpickr-calendar.open', &block)endenddef within_flatpickr_months(&block)- within find('.flatpickr-months .flatpickr-month .flatpickr-current-month', &block)+ within find('.flatpickr-months > .flatpickr-month > .flatpickr-current-month', &block)enddef within_flatpickr_time(&block)@@ -72,7 +85,9 @@ module Spreeenddef select_flatpickr_month(month)- find("select.flatpickr-monthDropdown-months > option:nth-child(#{month.to_i})").select_option+ accurate_month = (month.to_i - 1)++ find("select.flatpickr-monthDropdown-months > option[value='#{accurate_month}']").select_optionenddef fill_in_flatpickr_year(year)@@ -81,7 +96,7 @@ module Spreedef click_on_flatpickr_day(day)within_flatpickr_days do- find('.flatpickr-day:not(.prevMonthDay):not(.nextMonthDay)', text: day).click+ find('.flatpickr-day:not(.prevMonthDay):not(.nextMonthDay)', text: day, exact_text: true).clickendend@@ -96,6 +111,14 @@ module Spreedef select_flatpickr_min(min)find('input.flatpickr-minute').set(min)end++ def string_date(options)+ if options[:hour].present? && options[:minute].present?+ "#{options[:year]}-#{options[:month]}-#{options[:day]}-#{options[:hour]}-#{options[:minute]}"+ else+ "#{options[:year]}-#{options[:month]}-#{options[:day]}"+ end+ endendendend