cucumber-rails 2.5.0 → 2.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e1cd2904e66669d6acf0468d21a4a3e28ac560bae247cf683f9c0e237e2cd11
-  data.tar.gz: 7edc69638a3946df0ac20707ce080c45361b8cab885171ba370191d84f5268b3
+  metadata.gz: 02bbc6df3e0541e238dfedd61156318fc8766754bd66929553e41b3770507ed0
+  data.tar.gz: d9781472cfdebcaccec5fc0879698d486a06809d36809bc95c5624d36e13b6a0
 SHA512:
-  metadata.gz: eda48ea91bc84b2d3a4008dc8424c79e5ab3173dfaab739ed309f75619f8741899c12ba67c0d221be73aa6f052ebd7fe60e7cded149cfa4d4de19b59bfc3633e
-  data.tar.gz: 91f48677c021ad17c08b8a8fd50223c6942f7042ebfef1d68b3def47207cefecf73e45e5f955c881a3d180d9b8d821e87162bdd1dcaade16a702acbc66ed9bce
+  metadata.gz: 8868ff0ebe1844b2eae18b3b8b580ab00683790a7a02bc28aeb421b33ef4022eb4779478fff94de2f5abc80c068bdcdd098decdeab1b180dad37ae40bbe06ae2
+  data.tar.gz: 17ab8f1588d771f564aaec40a873e85f43d2b366674bb959bd4d2ddb4f519093f450f2411122498d8437d238a5b347483c34f9590a799d7f96d76ad790fd8e1b

data/CHANGELOG.md

@@ -1,19 +1,19 @@
 Please see [CONTRIBUTING.md](https://github.com/cucumber/cucumber/blob/master/CONTRIBUTING.md)
 on how to contribute to Cucumber.
 
-## [main](https://github.com/cucumber/cucumber-rails/compare/v2.5.0...main) (Not yet released)
+## [main](https://github.com/cucumber/cucumber-rails/compare/v2.5.1...main) (Not yet released)
 
 ### New Features
 
-
-
 ### Changed
 
+### Fixed
 
+## [v2.5.1](https://github.com/cucumber/cucumber-rails/compare/v2.5.0...v2.5.1) (2022-04-01)
 
 ### Fixed
 
-*
+* Date input support in Rails 7 ([#535](https://github.com/cucumber/cucumber-rails/pull/535) [mgrunberg])
 
 ## [v2.5.0](https://github.com/cucumber/cucumber-rails/compare/v2.4.0...v2.5.0) (2022-03-07)
 

data/lib/cucumber/rails/capybara/select_dates_and_times.rb

@@ -8,12 +8,13 @@ module Cucumber
         # Select a Rails date. Options hash must include from: +label+
         def select_date(date, options)
           date = Date.parse(date)
-          if ::Rails::VERSION::MAJOR >= 7
-            # Rails 7 generates date fields using input type="date". Capybara support's them
+          base_dom_id = get_base_dom_from_options(options)
+
+          # Rails 7 use HTML5 input type="date" by default. If input is not present fallback to plain select boxes alternative.
+          # It's safe to use has_css? without waiting/retry. We already know field's label is visible
+          if html5_input_field_present?(base_dom_id)
             fill_in options[:from], with: date
           else
-            base_dom_id = get_base_dom_id_from_label_tag(options[:from])
-
             find(:xpath, ".//select[@id='#{base_dom_id}_1i']").select(date.year.to_s)
             find(:xpath, ".//select[@id='#{base_dom_id}_2i']").select(I18n.l(date, format: '%B'))
             find(:xpath, ".//select[@id='#{base_dom_id}_3i']").select(date.day.to_s)
@@ -23,12 +24,13 @@ module Cucumber
         # Select a Rails time. Options hash must include from: +label+
         def select_time(time, options)
           time = Time.zone.parse(time)
-          if ::Rails::VERSION::MAJOR >= 7
-            # Rails 7 generates date fields using input type="time". Capybara support's them
+          base_dom_id = get_base_dom_from_options(options)
+
+          # Rails 7 use HTML5 input type="time" by default. If input is not present fallback to plain select boxes alternative.
+          # It's safe to use has_css? without waiting/retry. We already know field's label is visible
+          if html5_input_field_present?(base_dom_id)
             fill_in options[:from], with: time
           else
-            base_dom_id = get_base_dom_id_from_label_tag(options[:from])
-
             find(:xpath, ".//select[@id='#{base_dom_id}_4i']").select(time.hour.to_s.rjust(2, '0'))
             find(:xpath, ".//select[@id='#{base_dom_id}_5i']").select(time.min.to_s.rjust(2,  '0'))
           end
@@ -36,17 +38,29 @@ module Cucumber
 
         # Select a Rails datetime. Options hash must include from: +label+
         def select_datetime(datetime, options)
-          if ::Rails::VERSION::MAJOR >= 7
-            # Rails 7 generates datetime fields using input type="datetime-local". Capybara support's them
+          base_dom_id = get_base_dom_id_from_label_tag(options[:from])
+
+          # Rails 7 use HTML5 input type="datetime-local" by default. If input is not present fallback to plain select boxes alternative.
+          # It's safe to use has_css? without waiting/retry. We already know field's label is visible
+          if html5_input_field_present?(base_dom_id)
             fill_in options[:from], with: DateTime.parse(datetime)
           else
-            select_date(datetime, options)
-            select_time(datetime, options)
+            extended_options = options.merge(base_dom_id: base_dom_id)
+            select_date(datetime, extended_options)
+            select_time(datetime, extended_options)
           end
         end
 
         private
 
+        def html5_input_field_present?(base_dom_id)
+          ::Rails::VERSION::MAJOR >= 7 && page.has_css?("##{base_dom_id}", wait: 0)
+        end
+
+        def get_base_dom_from_options(options)
+          options[:base_dom_id] || get_base_dom_id_from_label_tag(options[:from])
+        end
+
         # @example "event_starts_at_"
         def get_base_dom_id_from_label_tag(field)
           find(:xpath, ".//label[contains(., '#{field}')]")['for'].gsub(/(_[1-5]i)$/, '')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cucumber-rails
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.5.1
 platform: ruby
 authors:
 - Aslak Hellesøy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-07 00:00:00.000000000 Z
+date: 2022-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -374,10 +374,10 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/cucumber/cucumber-rails/issues
-  changelog_uri: https://github.com/cucumber/cucumber-rails/blob/v2.5.0/CHANGELOG.md
+  changelog_uri: https://github.com/cucumber/cucumber-rails/blob/v2.5.1/CHANGELOG.md
   documentation_uri: https://cucumber.io/docs
   mailing_list_uri: https://groups.google.com/forum/#!forum/cukes
-  source_code_uri: https://github.com/cucumber/cucumber-rails/tree/v2.5.0
+  source_code_uri: https://github.com/cucumber/cucumber-rails/tree/v2.5.1
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -391,10 +391,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.6.1
 requirements: []
 rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
-summary: cucumber-rails-2.5.0
+summary: cucumber-rails-2.5.1
 test_files: []