cucumber-rails 2.2.0 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab9079b1b0b5cbf30f04627c088e6e73a78804c68852b02b834439892d579001
-  data.tar.gz: 244214de463e90d6b73fd09dd5316b5a68de6397f816a68d64710986445303e7
+  metadata.gz: 9e1cd2904e66669d6acf0468d21a4a3e28ac560bae247cf683f9c0e237e2cd11
+  data.tar.gz: 7edc69638a3946df0ac20707ce080c45361b8cab885171ba370191d84f5268b3
 SHA512:
-  metadata.gz: eb770970489ece31916eb57934a5bf9873db51377e6588f1b1150403c3ffd7ce735afd90481a49c497bfe24e9f2d744bcde22e1908db9f2459edd83f205e387f
-  data.tar.gz: ca257e8a0ea4f794323c3aff7597c73d96189f057be11339369c2f87aed77c9c47b3d7df9ad914006277edcc24d371cf7c28552751b0b9f91cf3f2d95029365d
+  metadata.gz: eda48ea91bc84b2d3a4008dc8424c79e5ab3173dfaab739ed309f75619f8741899c12ba67c0d221be73aa6f052ebd7fe60e7cded149cfa4d4de19b59bfc3633e
+  data.tar.gz: 91f48677c021ad17c08b8a8fd50223c6942f7042ebfef1d68b3def47207cefecf73e45e5f955c881a3d180d9b8d821e87162bdd1dcaade16a702acbc66ed9bce

data/CHANGELOG.md

@@ -1,13 +1,74 @@
 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.1.0...master) (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
+
+* 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])
@@ -16,20 +77,23 @@ on how to contribute to Cucumber.
 
  * 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
@@ -42,10 +106,10 @@ on how to contribute to Cucumber.
  * 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])
@@ -66,7 +130,7 @@ on how to contribute to Cucumber.
    [#460](https://github.com/cucumber/cucumber-rails/pull/460) /
    [#464](https://github.com/cucumber/cucumber-rails/pull/464)
    [mvz] / [damonjmurray] / [deivid-rodriguez])
-   
+
  * 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])
 
@@ -82,7 +146,7 @@ on how to contribute to Cucumber.
 
  * **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])
 
@@ -91,14 +155,14 @@ on how to contribute to Cucumber.
 ### Changed
 
  * 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
@@ -110,21 +174,21 @@ on how to contribute to Cucumber.
   [#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
@@ -144,7 +208,7 @@ on how to contribute to Cucumber.
  [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) /
@@ -164,7 +228,7 @@ on how to contribute to Cucumber.
  * 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)
@@ -179,7 +243,7 @@ on how to contribute to Cucumber.
 ## [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
@@ -629,3 +693,6 @@ and to celebrate that cucumber-rails now supports Capybara as an alternative to
 [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/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 5.x and 6.x.
+Cucumber-Rails brings Cucumber to Rails 5.x, 6.x and 7.x.
 
 ## Installation
 
@@ -123,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/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/deletion_strategy.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Cucumber
   module Rails
     module Database

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Cucumber
   module Rails
     module Database

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Cucumber
   module Rails
     module Database
@@ -8,6 +10,8 @@ module Cucumber
 
         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

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Cucumber
   module Rails
     module Database

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

@@ -8,10 +8,6 @@ module Cucumber
 
     DEFAULT_SHEBANG = File.join(RbConfig::CONFIG['bindir'], RbConfig::CONFIG['ruby_install_name'])
 
-    class_option :spork,
-                 type: :boolean,
-                 desc: 'Use Spork'
-
     class_option :skip_database,
                  type: :boolean,
                  desc: 'Skip modification of database.yml',
@@ -34,11 +30,16 @@ module Cucumber
 
     def create_feature_support
       empty_directory 'features/support'
-      if spork?
-        template 'support/rails_spork.rb.erb', 'features/support/env.rb'
-      else
-        template 'support/rails.rb.erb',       'features/support/env.rb'
-      end
+      template 'support/rails.rb.erb', 'features/support/env.rb'
+    end
+
+    def configure_environment
+      environment(<<~CONFIG, env: %w[development test]) if ::Rails::VERSION::MAJOR >= 6
+        # Configure 'rails notes' to inspect Cucumber files
+        config.annotations.register_directories('features')
+        config.annotations.register_extensions('feature') { |tag| /#\\s*(\#{tag}):?\\s*(.*)$/ }
+
+      CONFIG
     end
 
     def create_tasks
@@ -59,20 +60,16 @@ module Cucumber
 
     protected
 
-    def spork?
-      options[:spork]
-    end
-
     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

data/lib/generators/cucumber/templates/config/cucumber.yml.erb

@@ -4,6 +4,6 @@ rerun = rerun.strip.gsub /\s/, ' '
 rerun_opts = rerun.empty? ? "--format #{ENV['CUCUMBER_FORMAT'] || 'progress'} features" : "--format #{ENV['CUCUMBER_FORMAT'] || 'pretty'} #{rerun}"
 std_opts = "--format #{ENV['CUCUMBER_FORMAT'] || 'pretty'} --strict --tags 'not @wip'"
 %>
-default: <%= spork? ? '--drb ' : '' %><%%= std_opts %> features
-wip: <%= spork? ? '--drb ' : '' %>--tags @wip:3 --wip features
-rerun: <%= spork? ? '--drb ' : '' %><%%= rerun_opts %> --format rerun --out rerun.txt --strict --tags 'not @wip'
+default: <%%= std_opts %> features
+wip: --tags @wip:3 --wip features
+rerun: <%%= rerun_opts %> --format rerun --out rerun.txt --strict --tags 'not @wip'

data/lib/generators/cucumber/templates/tasks/cucumber.rake.erb

@@ -35,6 +35,7 @@ begin
       ::STATS_DIRECTORIES << %w(Cucumber\ features features) if File.exist?('features')
       ::CodeStatistics::TEST_TYPES << "Cucumber features" if File.exist?('features')
     end
+    <% if ::Rails::VERSION::MAJOR < 6 %>
 
     task :annotations_setup do
       Rails.application.configure do
@@ -44,7 +45,9 @@ begin
         end
       end
     end
+    <% end %>
   end
+
   desc 'Alias for cucumber:ok'
   task cucumber: 'cucumber:ok'
 
@@ -60,7 +63,9 @@ begin
 
   task stats: 'cucumber:statsetup'
 
+  <% if ::Rails::VERSION::MAJOR < 6 %>
   task notes: 'cucumber:annotations_setup'
+  <% end %>
 rescue LoadError
   desc 'cucumber rake task not available (cucumber not installed)'
   task :cucumber do