cucumber-rails 2.0.0 → 2.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aea01cd8d17a13c8f43f785981239c8aeb28202591bce35bedeee997ac2c25ea
-  data.tar.gz: f021c09f4793b9e179f80214d6572498645fd65a007a5e17121a91a73effc3a4
+  metadata.gz: 02bbc6df3e0541e238dfedd61156318fc8766754bd66929553e41b3770507ed0
+  data.tar.gz: d9781472cfdebcaccec5fc0879698d486a06809d36809bc95c5624d36e13b6a0
 SHA512:
-  metadata.gz: b90e398bf55e9bb8d3f5eb267bd981ba16929f16c2be420829da9498ba4c077f9ba37652a6744ac57a1a96653b2bccf1d0bc57b40aa1700a89725dfd9a95179c
-  data.tar.gz: 80ee71f600ddff221964012001529345b769503f12b9124257ddca788e8a27e132c62a71a712b80f1d4bd7b314ddfad7c32a741a314fac386d9fad7bb0c0c3f8
+  metadata.gz: 8868ff0ebe1844b2eae18b3b8b580ab00683790a7a02bc28aeb421b33ef4022eb4779478fff94de2f5abc80c068bdcdd098decdeab1b180dad37ae40bbe06ae2
+  data.tar.gz: 17ab8f1588d771f564aaec40a873e85f43d2b366674bb959bd4d2ddb4f519093f450f2411122498d8437d238a5b347483c34f9590a799d7f96d76ad790fd8e1b

data/CHANGELOG.md

@@ -1,20 +1,140 @@
-Please see [CONTRIBUTING.md](https://github.com/cucumber/cucumber/blob/master/CONTRIBUTING.md) on how to contribute to Cucumber.
+Please see [CONTRIBUTING.md](https://github.com/cucumber/cucumber/blob/master/CONTRIBUTING.md)
+on how to contribute to Cucumber.
 
-## [master](https://github.com/cucumber/cucumber-rails/compare/v2.0.0...master) (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)
+
+### New Features
+
+* Added `:none` option for `javascript_strategy` which indicates no special handling of `@javascript` tagged tests ([#522](https://github.com/cucumber/cucumber-rails/pull/522) [akostadinov])
+* Added support for Rails 7 ([#526](https://github.com/cucumber/cucumber-rails/pull/526/) [mgrunberg])
+* Added Ruby 3.1 support ([#529](https://github.com/cucumber/cucumber-rails/pull/529) [mgrunberg])
+
+### Changed
+
+* Dropped Ruby 2.4 support ([#529](https://github.com/cucumber/cucumber-rails/pull/529) [mgrunberg])
+
+## [v2.4.0](https://github.com/cucumber/cucumber-rails/compare/v2.3.0...v2.4.0) (2021-07-21)
+
+### New Features
+
+* Added new docker / Makefile script to permit releasing from repo ([#502](https://github.com/cucumber/cucumber-rails/pull/502) [luke-hill])
+* Gem update: allowed cucumber 6/7 ([#515](https://github.com/cucumber/cucumber-rails/pull/515) /
+                                    [#519](https://github.com/cucumber/cucumber-rails/pull/519))
+* Add support for Ruby 3 ([#517](https://github.com/cucumber/cucumber-rails/pull/517/))
+
+### Changed
+
+* Updated rubocop to use new major versions ([#504](https://github.com/cucumber/cucumber-rails/pull/504) /
+                                             [#519](https://github.com/cucumber/cucumber-rails/pull/519) [luke-hill])
+  
+### Removed
+
+* Removed traces of legacy spork setup / help (No longer used)  ([#518](https://github.com/cucumber/cucumber-rails/pull/518))
+
+## [v2.3.0](https://github.com/cucumber/cucumber-rails/compare/v2.2.0...v2.3.0) (2021-03-30)
+
+### Changed
+
+ * Changed dependency from rails to railties to avoid pulling in optional Rails gems like actioncable ([#486](https://github.com/cucumber/cucumber-rails/pull/486) [langalex])
+
+ * Lightened gem binary by removing un-needed files ([#496](https://github.com/cucumber/cucumber-rails/pull/496) [orien])
+
+### Fixed
+
+ * Fixed up a couple of legacy capybara specs to use a better format ([#498](https://github.com/cucumber/cucumber-rails/pull/498) [luke-hill])
+
+## [v2.2.0](https://github.com/cucumber/cucumber-rails/compare/v2.1.0...v2.2.0) (2020-08-10)
+
+### New Features
+
+ * Added more documentation and tests around Javascript tagged scenarios
+   ([#480](https://github.com/cucumber/cucumber-rails/pull/480) [luke-hill])
+
+ * Gem Updates
+   * Allowed cucumber5, updated other gem dependencies
+   * Updated travis runs and gem builds tested against
+   ([#482](https://github.com/cucumber/cucumber-rails/pull/482) [luke-hill])
 
 ### Changed
 
- * 
+ * Dropped Rails 4.2 support ([#392](https://github.com/cucumber/cucumber-rails/pull/392) [deivid-rodriguez])
+
+### Fixed
+
+ * Database cleaning no longer silently fails when using database_cleaner v2 adapter gems
+   ([#467](https://github.com/cucumber/cucumber-rails/pull/467) [botandrose])
+
+ * Restored compatibility with `database_cleaner` versions earlier than 1.8.0.beta
+   ([#473](https://github.com/cucumber/cucumber-rails/pull/473) [cgriego])
+
+ * Restored previous `database_cleaner` behavior for apps that do not use/load ActiveRecord
+   ([#474](https://github.com/cucumber/cucumber-rails/pull/474) [cgriego])
+
+ * Restored previous compatibility around standard Rails Modules not being loaded
+   ([#484](https://github.com/cucumber/cucumber-rails/pull/484) [Draiken])
+
+## [v2.1.0](https://github.com/cucumber/cucumber-rails/compare/v2.0.0...v2.1.0) (2020-06-15)
+
+### New Features
+
+ * Added metadata to allow gem to be searched / indexed by rubygems
+    ([#447](https://github.com/cucumber/cucumber-rails/pull/447) [orien])
+
+ * Allow Cucumber 4 to be used as an option for cucumber-rails
+   * NB: Cucumber4 changes quite a lot of logic with auto-loaders. This means that any previous
+   logic that relied implicitly on load-order "may" be affected
+   ([#453](https://github.com/cucumber/cucumber-rails/pull/453) [luke-hill] / [deivid-rodriguez])
+
+### Changed
+
+ * Dropped Ruby 2.3 support (target 2.4 - 2.7) ([#466](https://github.com/cucumber/cucumber-rails/pull/466) [mvz])
+
+ * Refactored suite to remove a lot of old Rails3/4.0 "ism's"
+   * Also migrated a lot of old cucumber styles to cucumber4
+   ([#441](https://github.com/cucumber/cucumber-rails/pull/441) [luke-hill])
+
+ * Refactored alias logic for overriding Rails methods to use `Module#prepend`
+   ([#457](https://github.com/cucumber/cucumber-rails/pull/457) [wagenet])
+
+ * `database_cleaner` (when used), at a version `>= 1.8` will now silence all warnings
+   * The suite internally will only test a version `>= 1.8`, so other versions will work but are un-maintained
+   ([#463](https://github.com/cucumber/cucumber-rails/pull/463) [deivid-rodriguez])
 
 ### Fixed
 
- * 
+ * Various rubocop / rspec styling fixes
+   ([#445](https://github.com/cucumber/cucumber-rails/pull/445) /
+    [#449](https://github.com/cucumber/cucumber-rails/pull/449) /
+    [#450](https://github.com/cucumber/cucumber-rails/pull/450) /
+    [#451](https://github.com/cucumber/cucumber-rails/pull/451) /
+    [#452](https://github.com/cucumber/cucumber-rails/pull/452) /
+    [#465](https://github.com/cucumber/cucumber-rails/pull/465)
+   [mvz] / [luke-hill])
+
+ * Various CI fixes
+   ([#444](https://github.com/cucumber/cucumber-rails/pull/444) /
+   [#460](https://github.com/cucumber/cucumber-rails/pull/460) /
+   [#464](https://github.com/cucumber/cucumber-rails/pull/464)
+   [mvz] / [damonjmurray] / [deivid-rodriguez])
 
-## [v2.0.0](https://github.com/cucumber/cucumber-rails/compare/v1.8.0...v2.0.0) (Not yet released)
+ * Avoid printing a warning about `config.cache_classes` being set to `false` when
+   Spring is used ([#462](https://github.com/cucumber/cucumber-rails/pull/462) [janko])
+
+## [v2.0.0](https://github.com/cucumber/cucumber-rails/compare/v1.8.0...v2.0.0) (2019-09-13)
 
 ### New Features
 
@@ -26,7 +146,7 @@ Please see [CONTRIBUTING.md](https://github.com/cucumber/cucumber/blob/master/CO
 
  * **Breaking change:** `web_steps` have been completely removed from cucumber-rails
    ([#437](https://github.com/cucumber/cucumber-rails/pull/437) [luke-hill])
-   
+
  * Altered some branching logic in tests designed to cater for old ruby/rails versions
    ([#433](https://github.com/cucumber/cucumber-rails/pull/433) [luke-hill])
 
@@ -34,15 +154,15 @@ Please see [CONTRIBUTING.md](https://github.com/cucumber/cucumber/blob/master/CO
 
 ### Changed
 
- * Drop Ruby 2.2 support (target 2.3 and up) ([#424](https://github.com/cucumber/cucumber-rails/pull/424) [mvz])
- 
+ * Dropped Ruby 2.2 support (target 2.3 and up) ([#424](https://github.com/cucumber/cucumber-rails/pull/424) [mvz])
+
  * Begin to update the core runtime / development dependencies to something a little more recent
    ([#413](https://github.com/cucumber/cucumber-rails/pull/413) /
    [#431](https://github.com/cucumber/cucumber-rails/pull/431) /
    [#432](https://github.com/cucumber/cucumber-rails/pull/432)
-   [mvz] / 
+   [mvz] /
    [luke-hill])
-   
+
 ### Fixed
 
  * Various rubocop / styling issues that had built up over time
@@ -54,21 +174,21 @@ Please see [CONTRIBUTING.md](https://github.com/cucumber/cucumber/blob/master/CO
   [#421](https://github.com/cucumber/cucumber-rails/pull/434)
   [luke-hill] /
   [mvz])
-  
+
  * Generic Travis Healthcheck (Fixed up polluted logs and use newer Ubuntu OS)
   ([#415](https://github.com/cucumber/cucumber-rails/pull/415) /
   [#417](https://github.com/cucumber/cucumber-rails/pull/417)
   [luke-hill])
-  
+
  * Rails6 not building correctly
   ([#418](https://github.com/cucumber/cucumber-rails/pull/418)
   [luke-hill])
-  
+
  * Provisional Ruby 2.7 builds not working
   ([#427](https://github.com/cucumber/cucumber-rails/pull/427)
   [amatsuda] /
   [luke-hill])
- 
+
 ## [v1.7.0](https://github.com/cucumber/cucumber-rails/compare/v1.6.0...v1.7.0) (2019-04-17)
 
 ### Changed
@@ -88,7 +208,7 @@ Please see [CONTRIBUTING.md](https://github.com/cucumber/cucumber/blob/master/CO
  [xtrasimplicity] /
  [deivid-rodriguez] /
  [mvz])
- 
+
  * Various build issues that had built up over the previous year
   ([#403](https://github.com/cucumber/cucumber-rails/pull/403) /
   [#404](https://github.com/cucumber/cucumber-rails/pull/404) /
@@ -108,7 +228,7 @@ Please see [CONTRIBUTING.md](https://github.com/cucumber/cucumber/blob/master/CO
  * Switched to Ruby 1.9 hash syntax. ([#371](https://github.com/cucumber/cucumber-rails/pull/371) [mvz](https://github.com/mvz))
  * Added support to handle rerun files with multiple lines. ([#373]((https://github.com/cucumber/cucumber-rails/pull/345)) [mvz](https://github.com/mvz))
  * Added support for Rails 5.2 and Capybara 3. ([#378](https://github.com/cucumber/cucumber-rails/pull/378/) [gobijan](https://github.com/gobijan), [radar](https://github.com/radar), [xtrasimplicity](https://github.com/xtrasimplicity))
- 
+
 ### Fixed
 
  * Fix typo ([#343](https://github.com/cucumber/cucumber-rails/pull/343) Olle Jonsson)
@@ -123,7 +243,7 @@ Please see [CONTRIBUTING.md](https://github.com/cucumber/cucumber/blob/master/CO
 ## [v1.4.5](https://github.com/cucumber/cucumber-rails/compare/1.4.4...1.4.5) (2016-09-27)
 
  * Add support for Cucumber 3+ (Steve Tooke)
- 
+
 ## [v1.4.4](https://github.com/cucumber/cucumber-rails/compare/1.4.3...1.4.4) (2016-08-05)
 
  * Ensure support for Rails 5
@@ -567,3 +687,12 @@ and to celebrate that cucumber-rails now supports Capybara as an alternative to
 [luke-hill]: https://github.com/luke-hill
 [amatsuda]: https://github.com/amatsuda
 [xtrasimplicity]: https://github.com/xtrasimplicity
+[janko]: https://github.com/janko
+[damonjmurray]: https://github.com/damonjmurray
+[orien]: https://github.com/orien
+[wagenet]: https://github.com/wagenet
+[cgriego]: https://github.com/cgriego
+[botandrose]: https://github.com/botandrose
+[Draiken]: https://github.com/Draiken
+[langalex]: https://github.com/langalex
+[orien]: https://github.com/orien

data/CONTRIBUTING.md

@@ -29,11 +29,23 @@ This document is a guide for those maintaining Cucumber-Rails, and others who wo
     bundle install
     bin/install_geckodriver.sh
     bin/install_webpacker.sh
-    # Then to run tests on one specific gemfile (i.e. Rails 4.2), run
-    bundle exec appraisal rails_4_2 rake test
+    # Then to run tests on one version-specific Gemfile (e.g. gemfiles/rails_6_0.gemfile), run
+    bundle exec appraisal rails_6_0 rake test
     # Or run tests across the full supported stack. Note that because we support many versions. This takes 5-10 minutes
     bundle exec rake appraisal
 
+## Updating Appraisal gems / dependencies of cucumber-rails
+
+To remove and rebuild the different gemfiles (for example, to update a rails version or its
+dependencies), use the following:
+
+    [bundle exec] appraisal update
+
+If you've changed versions of the dependencies, you may find it helpful to forcefully clean
+each appraisal's gem lock file in `gemfiles/`. You can do this using:
+
+    [bundle exec] rake clean
+    
 ## Release Process
 
 * Make sure `CHANGELOG.md` is updated with the upcoming version number, and has entries for all fixes.

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License
 
-Copyright (c) 2008-2019 Aslak Hellesøy and the Cucumber Team.
+Copyright (c) 2008-2020 Aslak Hellesøy and the Cucumber Team.
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -1,11 +1,13 @@
 # Cucumber-Rails
 
 [![Gem Version](https://badge.fury.io/rb/cucumber-rails.svg)](http://badge.fury.io/rb/cucumber-rails)
-[![Build Status](https://secure.travis-ci.org/cucumber/cucumber-rails.svg?branch=master)](http://travis-ci.org/cucumber/cucumber-rails)
+[![Build Status](https://github.com/cucumber/cucumber-rails/actions/workflows/build.yml/badge.svg?branch=master)](https://github.com/cucumber/cucumber-rails/actions/workflows/build.yml)
 [![Code Climate](https://codeclimate.com/github/cucumber/cucumber-rails.svg)](https://codeclimate.com/github/cucumber/cucumber-rails)
 [![Open Source Helpers](https://www.codetriage.com/cucumber/cucumber-rails/badges/users.svg)](https://www.codetriage.com/cucumber/cucumber-rails)
+[![pull requests](https://oselvar.com/api/badge?label=pull%20requests&csvUrl=https%3A%2F%2Fraw.githubusercontent.com%2Fcucumber%2Foselvar-github-metrics%2Fmain%2Fdata%2Fcucumber%2Fcucumber-rails%2FpullRequests.csv)](https://oselvar.com/github/cucumber/oselvar-github-metrics/main/cucumber/cucumber-rails)
+[![issues](https://oselvar.com/api/badge?label=issues&csvUrl=https%3A%2F%2Fraw.githubusercontent.com%2Fcucumber%2Foselvar-github-metrics%2Fmain%2Fdata%2Fcucumber%2Fcucumber-rails%2Fissues.csv)](https://oselvar.com/github/cucumber/oselvar-github-metrics/main/cucumber/cucumber-rails)
 
-Cucumber-Rails brings Cucumber to Rails 4.2, 5.x and 6.x.
+Cucumber-Rails brings Cucumber to Rails 5.x, 6.x and 7.x.
 
 ## Installation
 
@@ -108,17 +110,7 @@ all gemfiles, run the following commands:
 
 To run the suite against a named gemfile, use the following:
 
-    [bundle exec] appraisal rails_4_2 rake test
-
-To remove and rebuild the different gemfiles (for example, to update a rails version or its
-dependencies), use the following:
-
-    [bundle exec] appraisal update
-
-If you've changed versions of the dependencies, you may find it helpful to forcefully clean
-each appraisal's gem lock file in `gemfiles/`. You can do this using:
-
-    [bundle exec] rake clean
+    [bundle exec] appraisal rails_6_0 rake test
 
 ### Adding dependencies
 
@@ -133,14 +125,3 @@ For example, rspec is a primary development dependency, so it lives in the gemsp
 
 [the helper]: https://github.com/cucumber/cucumber-rails/blob/5e37c530560ae1c1a79521c38a54bae0be94242b/features/step_definitions/cucumber_rails_steps.rb#L15
 
-### NOTE
-
-If you get an error while trying to run the tests locally, similar to the one below:
-
-    Could not find a JavaScript runtime. See https://github.com/sstephenson/execjs for a list of available runtimes. (ExecJS::RuntimeUnavailable)
-    
-You need to install a javascript runtime.
-
-You can do that in ubuntu by using:
-
-    sudo apt-get install nodejs

data/lib/cucumber/rails/action_dispatch.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+ActionController::Base.class_eval do
+  cattr_accessor :allow_rescue
+end
+
+module Cucumber
+  module Rails
+    module ActionDispatch
+      module ShowExceptions
+        def call(env)
+          env['action_dispatch.show_detailed_exceptions'] = !ActionController::Base.allow_rescue
+          env['action_dispatch.show_exceptions'] = !env['action_dispatch.show_detailed_exceptions']
+          super(env)
+        end
+      end
+    end
+  end
+end
+
+ActionDispatch::ShowExceptions.prepend(Cucumber::Rails::ActionDispatch::ShowExceptions)

data/lib/cucumber/rails/application.rb

@@ -7,17 +7,20 @@ require 'rails/application'
 # Instead we are overriding ActionDispatch::ShowExceptions to be able to
 # toggle whether or not exceptions are raised.
 
-module Rails
-  class Application
-    alias __cucumber_orig_initialize__ initialize!
+module Cucumber
+  module Rails
+    module Application
+      def initialize!
+        ad = config.action_dispatch
 
-    def initialize!
-      ad = config.action_dispatch
+        def ad.show_exceptions
+          true
+        end
 
-      def ad.show_exceptions
-        true
+        super
       end
-      __cucumber_orig_initialize__
     end
   end
 end
+
+Rails::Application.prepend(Cucumber::Rails::Application)

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

@@ -48,27 +48,38 @@ module Cucumber
           js_form['action'] = action
           js_form['method'] = method
 
-          if emulated_method && !emulated_method.casecmp(method).zero?
-            input = document.create_element('input')
-            input['type'] = 'hidden'
-            input['name'] = '_method'
-            input['value'] = emulated_method
-            js_form.add_child(input)
-          end
+          add_hidden_method_input(document, js_form) unless same?(emulated_method, method)
 
-          # rails will wipe the session if the CSRF token is not sent
-          # with non-GET requests
-          if csrf? && !emulated_method.casecmp('get').zero?
-            input = document.create_element('input')
-            input['type'] = 'hidden'
-            input['name'] = csrf_param
-            input['value'] = csrf_token
-            js_form.add_child(input)
-          end
+          # rails will wipe the session if the CSRF token is not sent with non-GET requests
+          add_hidden_csrf_input(document, js_form) if csrf? && !get?(emulated_method)
 
           js_form
         end
 
+        def same?(emulated_method, method)
+          emulated_method.casecmp(method).zero?
+        end
+
+        def add_hidden_method_input(document, js_form)
+          input = document.create_element('input')
+          input['type'] = 'hidden'
+          input['name'] = '_method'
+          input['value'] = emulated_method
+          js_form.add_child(input)
+        end
+
+        def get?(emulated_method)
+          same?(emulated_method, 'get')
+        end
+
+        def add_hidden_csrf_input(document, js_form)
+          input = document.create_element('input')
+          input['type'] = 'hidden'
+          input['name'] = csrf_param
+          input['value'] = csrf_token
+          js_form.add_child(input)
+        end
+
         def link_with_non_get_http_method?
           tag_name == 'a' &&
             element_node['data-method'] &&

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

@@ -7,31 +7,60 @@ module Cucumber
       module SelectDatesAndTimes
         # Select a Rails date. Options hash must include from: +label+
         def select_date(date, options)
-          date        = Date.parse(date)
-          base_dom_id = get_base_dom_id_from_label_tag(options[:from])
+          date = Date.parse(date)
+          base_dom_id = get_base_dom_from_options(options)
 
-          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)
+          # 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
+            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)
+          end
         end
 
         # Select a Rails time. Options hash must include from: +label+
         def select_time(time, options)
-          time        = Time.zone.parse(time)
-          base_dom_id = get_base_dom_id_from_label_tag(options[:from])
+          time = Time.zone.parse(time)
+          base_dom_id = get_base_dom_from_options(options)
 
-          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'))
+          # 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
+            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
         end
 
         # Select a Rails datetime. Options hash must include from: +label+
         def select_datetime(datetime, options)
-          select_date(datetime, options)
-          select_time(datetime, options)
+          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
+            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)$/, '')

data/lib/cucumber/rails/database/deletion_strategy.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Cucumber
+  module Rails
+    module Database
+      class DeletionStrategy < Strategy
+        def before_js
+          super :deletion
+        end
+      end
+    end
+  end
+end

data/lib/cucumber/rails/database/null_strategy.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Cucumber
+  module Rails
+    module Database
+      class NullStrategy
+        def before_js; end
+
+        def before_non_js; end
+
+        def after; end
+      end
+    end
+  end
+end

data/lib/cucumber/rails/database/shared_connection_strategy.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Cucumber
+  module Rails
+    module Database
+      class SharedConnectionStrategy < Strategy
+        def before_js
+          # Forces all threads to share a connection on a per-model basis,
+          # as connections may vary per model as per establish_connection. This works
+          # on Capybara because it starts the web server in a thread.
+          ActiveRecord::Base.shared_connection = ActiveRecord::Base.connection
+          ActiveRecord::Base.descendants.each do |model|
+            model.shared_connection = model.connection
+          end
+        end
+
+        def before_non_js
+          # Do not use a shared connection unless we're in a @javascript scenario
+          ActiveRecord::Base.shared_connection = nil
+          ActiveRecord::Base.descendants.each do |model|
+            model.shared_connection = nil
+          end
+        end
+      end
+    end
+  end
+end

data/lib/cucumber/rails/database/strategy.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module Cucumber
+  module Rails
+    module Database
+      class Strategy
+        def initialize(options = {})
+          @options = options
+        end
+
+        def before_js(strategy)
+          @original_strategy = if defined?(DatabaseCleaner::VERSION) && Gem::Version.new(DatabaseCleaner::VERSION) >= Gem::Version.new('1.8.0.beta')
+                                 raise "No DatabaseCleaner strategies found. Make sure you have required one of DatabaseCleaner's adapters" if DatabaseCleaner.cleaners.empty?
+
+                                 DatabaseCleaner.cleaners.values.first.strategy # that feels like a nasty hack
+                               else
+                                 DatabaseCleaner.connections.first.strategy # that feels like a nasty hack
+                               end
+          DatabaseCleaner.strategy = strategy, @options
+        end
+
+        def before_non_js
+          # no-op
+        end
+
+        def after
+          return unless @original_strategy
+
+          DatabaseCleaner.strategy = @original_strategy
+          @original_strategy = nil
+        end
+      end
+    end
+  end
+end

data/lib/cucumber/rails/database/truncation_strategy.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Cucumber
+  module Rails
+    module Database
+      class TruncationStrategy < Strategy
+        def before_js
+          super :truncation
+        end
+      end
+    end
+  end
+end