cucumber-rails 2.4.0 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d764b02e53187004f18c9fdc74de22286dde7a2844bb453c5dc807faaaa20b0b
-  data.tar.gz: 24b459b96e9f4c904c7c4b075bff63cf360e65b26b0c90b78d611bd5edab9af8
+  metadata.gz: 9e1cd2904e66669d6acf0468d21a4a3e28ac560bae247cf683f9c0e237e2cd11
+  data.tar.gz: 7edc69638a3946df0ac20707ce080c45361b8cab885171ba370191d84f5268b3
 SHA512:
-  metadata.gz: 14035d2a0e522ae20fc396e8b3eea3f3f0dc78631bfb7d15ff6d3fe77763463aa0ccfc088296952bbfd3cfcefff6b0a0a64bf4bdc7eb4b6b38e44a822bb9eb97
-  data.tar.gz: a3d599cc9cdb5de6f2db472bbbacfafeddbf11699eb6bf05103c3b6b3f8d31f7a620bbb97786a2c74e09ecce3712e4942828e2c8e1a8f01efbfe2db1d054280b
+  metadata.gz: eda48ea91bc84b2d3a4008dc8424c79e5ab3173dfaab739ed309f75619f8741899c12ba67c0d221be73aa6f052ebd7fe60e7cded149cfa4d4de19b59bfc3633e
+  data.tar.gz: 91f48677c021ad17c08b8a8fd50223c6942f7042ebfef1d68b3def47207cefecf73e45e5f955c881a3d180d9b8d821e87162bdd1dcaade16a702acbc66ed9bce

data/CHANGELOG.md

@@ -1,20 +1,32 @@
 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.4.0...main) (Not yet released)
+## [main](https://github.com/cucumber/cucumber-rails/compare/v2.5.0...main) (Not yet released)
 
 ### New Features
 
-* 
+
 
 ### Changed
 
-*
+
 
 ### Fixed
 
 *
 
+## [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

data/README.md

@@ -7,7 +7,7 @@
 [![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 5.x and 6.x.
+Cucumber-Rails brings Cucumber to Rails 5.x, 6.x and 7.x.
 
 ## Installation
 

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

@@ -7,27 +7,42 @@ 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])
-
-          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)
+          date = Date.parse(date)
+          if ::Rails::VERSION::MAJOR >= 7
+            # Rails 7 generates date fields using input type="date". Capybara support's them
+            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)
+          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])
-
-          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'))
+          time = Time.zone.parse(time)
+          if ::Rails::VERSION::MAJOR >= 7
+            # Rails 7 generates date fields using input type="time". Capybara support's them
+            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
         end
 
         # Select a Rails datetime. Options hash must include from: +label+
         def select_datetime(datetime, options)
-          select_date(datetime, options)
-          select_time(datetime, options)
+          if ::Rails::VERSION::MAJOR >= 7
+            # Rails 7 generates datetime fields using input type="datetime-local". Capybara support's them
+            fill_in options[:from], with: DateTime.parse(datetime)
+          else
+            select_date(datetime, options)
+            select_time(datetime, options)
+          end
         end
 
         private

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.rb

@@ -49,7 +49,8 @@ module Cucumber
             truncation: TruncationStrategy,
             shared_connection: SharedConnectionStrategy,
             transaction: SharedConnectionStrategy,
-            deletion: DeletionStrategy
+            deletion: DeletionStrategy,
+            none: NullStrategy
           }
         end
 

data/lib/cucumber/rails.rb

@@ -24,6 +24,7 @@ if called_from_env_rb
   require 'cucumber/rails/capybara'
   require 'cucumber/rails/database/strategy'
   require 'cucumber/rails/database/deletion_strategy'
+  require 'cucumber/rails/database/null_strategy'
   require 'cucumber/rails/database/shared_connection_strategy'
   require 'cucumber/rails/database/truncation_strategy'
   require 'cucumber/rails/database'

data/lib/generators/cucumber/install_generator.rb

@@ -61,15 +61,15 @@ module Cucumber
     protected
 
     def embed_file(source, indent = '')
-      IO.read(File.join(self.class.source_root, source)).gsub(/^/, indent)
+      File.read(File.join(self.class.source_root, source)).gsub(/^/, indent)
     end
 
     def embed_template(source, indent = '')
       template = File.join(self.class.source_root, source)
       if RUBY_VERSION >= '2.6'
-        ERB.new(IO.read(template), trim_mode: '-').result(binding).gsub(/^/, indent)
+        ERB.new(File.read(template), trim_mode: '-').result(binding).gsub(/^/, indent)
       else
-        ERB.new(IO.read(template), nil, '-').result(binding).gsub(/^/, indent)
+        ERB.new(File.read(template), nil, '-').result(binding).gsub(/^/, indent)
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cucumber-rails
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.5.0
 platform: ruby
 authors:
 - Aslak Hellesøy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-21 00:00:00.000000000 Z
+date: 2022-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -89,7 +89,7 @@ dependencies:
         version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -99,7 +99,7 @@ dependencies:
         version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '8'
 - !ruby/object:Gem::Dependency
   name: rexml
   requirement: !ruby/object:Gem::Requirement
@@ -238,14 +238,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.24.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.24.0
 - !ruby/object:Gem::Dependency
   name: rubocop-packaging
   requirement: !ruby/object:Gem::Requirement
@@ -348,6 +348,7 @@ files:
 - lib/cucumber/rails/capybara/select_dates_and_times.rb
 - lib/cucumber/rails/database.rb
 - lib/cucumber/rails/database/deletion_strategy.rb
+- lib/cucumber/rails/database/null_strategy.rb
 - lib/cucumber/rails/database/shared_connection_strategy.rb
 - lib/cucumber/rails/database/strategy.rb
 - lib/cucumber/rails/database/truncation_strategy.rb
@@ -373,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.4.0/CHANGELOG.md
+  changelog_uri: https://github.com/cucumber/cucumber-rails/blob/v2.5.0/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.4.0
+  source_code_uri: https://github.com/cucumber/cucumber-rails/tree/v2.5.0
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -385,7 +386,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -395,5 +396,5 @@ requirements: []
 rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
-summary: cucumber-rails-2.4.0
+summary: cucumber-rails-2.5.0
 test_files: []