cucumber-rails 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aea01cd8d17a13c8f43f785981239c8aeb28202591bce35bedeee997ac2c25ea
-  data.tar.gz: f021c09f4793b9e179f80214d6572498645fd65a007a5e17121a91a73effc3a4
+  metadata.gz: eba00efc3e821aa337c9e16993ba558c1a5f1c795c5db9fb00104f5de38839cd
+  data.tar.gz: af9a02416bdeda7f9d3c1c3600df92ff2248788909c1f18ff333223c025e64cc
 SHA512:
-  metadata.gz: b90e398bf55e9bb8d3f5eb267bd981ba16929f16c2be420829da9498ba4c077f9ba37652a6744ac57a1a96653b2bccf1d0bc57b40aa1700a89725dfd9a95179c
-  data.tar.gz: 80ee71f600ddff221964012001529345b769503f12b9124257ddca788e8a27e132c62a71a712b80f1d4bd7b314ddfad7c32a741a314fac386d9fad7bb0c0c3f8
+  metadata.gz: c711b5a237e9d4e9e53936e2d9836d74f58604a864769c91758a00a742649945e2a798ea4881b26466a21307bed029dac6f36f5dc54650e406133fd27d35c82e
+  data.tar.gz: 499ba57f75835fc6ca390e7c313e7dd442a1b92cddb30b516841892bd15223ecd41b595e885e7bb3dbe890847f7a1e03b0c9195656b0a6e7915d19af67d5d59d

data/.rubocop.yml

@@ -1,33 +1,68 @@
-inherit_from: .rubocop_todo.yml
-
 require:
   - rubocop-rspec
   - rubocop-performance
 
 AllCops:
-  TargetRubyVersion: 2.3
+  TargetRubyVersion: 2.4
   Exclude:
-    # These are auto-generated from a load of features that we
-    # don't have direct control over
+    # These are auto-generated from a load of features that use aruba
     - 'tmp/**/*'
     # Generated by appraisal
     - 'gemfiles/*.gemfile'
 
-Style/Documentation:
-  Enabled: false
+# These two areas will frequently break this limit, so we ignore the limit
+Metrics/BlockLength:
+  Exclude:
+    - './spec/**/*_spec.rb'
+    - 'cucumber-rails.gemspec'
+
+# This allows us to read the chmod action in a more reproducible way
+Style/NumericLiteralPrefix:
+  EnforcedOctalStyle: zero_only
+
+# Enable new cops
+Layout/EmptyLinesAroundAttributeAccessor:
+  Enabled: true
+Layout/SpaceAroundMethodCallOperator:
+  Enabled: true
+Lint/DeprecatedOpenSSLConstant:
+  Enabled: true
+Lint/MixedRegexpCaptureTypes:
+  Enabled: true
+Lint/RaiseException:
+  Enabled: true
+Lint/StructNewOverride:
+  Enabled: true
+Style/ExponentialNotation:
+  Enabled: true
+Style/HashEachMethods:
+  Enabled: true
+Style/HashTransformKeys:
+  Enabled: true
+Style/HashTransformValues:
+  Enabled: true
+Style/RedundantRegexpCharacterClass:
+  Enabled: true
+Style/RedundantRegexpEscape:
+  Enabled: true
+Style/SlicingWithRange:
+  Enabled: true
 
-Metrics/LineLength:
+## Cucumber Repo styles (Across implementations) ##
+
+Layout/LineLength:
   Max: 200
   IgnoredPatterns:
     - '^Given'
     - '^When'
     - '^Then'
 
+Style/Documentation:
+  Enabled: false
+
 Style/RegexpLiteral:
   EnforcedStyle: slashes
   AllowInnerSlashes: true
 
-BlockLength:
-  Exclude:
-    - './spec/**/*_spec.rb'
-    - 'cucumber-rails.gemspec'
+RSpec/MessageSpies:
+  EnforcedStyle: receive

data/.travis.yml

@@ -1,12 +1,12 @@
 language: ruby
 
-dist: xenial
+dist: bionic
 
 rvm:
-  - 2.3
   - 2.4
   - 2.5
   - 2.6
+  - 2.7
   - ruby-head
 
 addons:
@@ -33,10 +33,6 @@ matrix:
   exclude:
   # Only test Rails6 on supported rubies
   # Don't test lowest rails support on maintained rubies
-    - rvm: 2.3
-      gemfile: gemfiles/rails_6_0.gemfile
-    - rvm: 2.4
-      gemfile: gemfiles/rails_4_2.gemfile
     - rvm: 2.4
       gemfile: gemfiles/rails_6_0.gemfile
     - rvm: 2.5
@@ -47,6 +43,12 @@ matrix:
       gemfile: gemfiles/rails_5_0.gemfile
     - rvm: 2.6
       gemfile: gemfiles/rails_5_1.gemfile
+    - rvm: 2.7
+      gemfile: gemfiles/rails_4_2.gemfile
+    - rvm: 2.7
+      gemfile: gemfiles/rails_5_0.gemfile
+    - rvm: 2.7
+      gemfile: gemfiles/rails_5_1.gemfile
     - rvm: ruby-head
       gemfile: gemfiles/rails_4_2.gemfile
     - rvm: ruby-head

data/CHANGELOG.md

@@ -1,6 +1,7 @@
-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)
+## [master](https://github.com/cucumber/cucumber-rails/compare/v2.1.0...master) (Not yet released)
 
 ### New Features
 
@@ -8,13 +9,60 @@ Please see [CONTRIBUTING.md](https://github.com/cucumber/cucumber/blob/master/CO
 
 ### Changed
 
- * 
+ *
 
 ### Fixed
 
- * 
+ *
+
+## [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])
+   
+ * 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) (Not yet released)
+## [v2.0.0](https://github.com/cucumber/cucumber-rails/compare/v1.8.0...v2.0.0) (2019-09-13)
 
 ### New Features
 
@@ -34,7 +82,7 @@ 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) /
@@ -567,3 +615,7 @@ 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

data/Rakefile

@@ -29,7 +29,7 @@ namespace :test do
   desc 'Run tests against specified gemfile, e.g. rake test:gemfile[rails_3_0]'
   task :gemfile, :name do |_task, args|
     unless args.name && Pathname.new("gemfiles/#{args.name}.gemfile").exist?
-      raise ArgumentError "You must provide the name of an existing Appraisal gemfile,
+      raise ArgumentError, "You must provide the name of an existing Appraisal gemfile,
         e.g. 'rake test:gemfile[rails_4_2]'"
     end
 

data/cucumber-rails.gemspec

@@ -4,39 +4,46 @@ $LOAD_PATH.unshift File.expand_path('lib', __dir__)
 
 Gem::Specification.new do |s|
   s.name        = 'cucumber-rails'
-  s.version     = '2.0.0'
+  s.version     = '2.1.0'
   s.authors     = ['Aslak Hellesøy', 'Dennis Blöte', 'Rob Holland']
   s.description = 'Cucumber Generator and Runtime for Rails'
   s.summary     = "#{s.name}-#{s.version}"
   s.email       = 'cukes@googlegroups.com'
-  s.homepage    = 'http://cukes.info'
+  s.homepage    = 'https://cucumber.io'
 
   s.license = 'MIT'
 
+  s.metadata = {
+    'bug_tracker_uri' => 'https://github.com/cucumber/cucumber-rails/issues',
+    'changelog_uri' => "https://github.com/cucumber/cucumber-rails/blob/v#{s.version}/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/v#{s.version}"
+  }
+
   s.add_runtime_dependency('capybara', ['>= 2.12', '< 4'])
-  s.add_runtime_dependency('cucumber', ['>= 3.0.2', '< 4'])
+  s.add_runtime_dependency('cucumber', ['>= 3.0.2', '< 5'])
   s.add_runtime_dependency('mime-types', ['>= 2.0', '< 4'])
   s.add_runtime_dependency('nokogiri', '~> 1.8')
-  s.add_runtime_dependency('railties', ['>= 4.2', '< 7'])
+  s.add_runtime_dependency('rails', ['>= 4.2', '< 7'])
 
   # Main development dependencies
   s.add_development_dependency('ammeter', '>= 1.1.4')
-  s.add_development_dependency('aruba', '~> 0.14.4')
   s.add_development_dependency('appraisal', '~> 2.2')
+  s.add_development_dependency('aruba', '~> 1.0')
   s.add_development_dependency('bundler', '>= 1.17')
-  s.add_development_dependency('rails', ['>= 4.2', '< 7'])
   s.add_development_dependency('rake', '>= 12.0')
   s.add_development_dependency('rspec', '~> 3.6')
-  s.add_development_dependency('rubocop', '~> 0.72.0')
-  s.add_development_dependency('rubocop-performance', '~> 1.4.0')
-  s.add_development_dependency('rubocop-rspec', '~> 1.33.0')
+  s.add_development_dependency('rubocop', '~> 0.85.0')
+  s.add_development_dependency('rubocop-performance', '~> 1.6.1')
+  s.add_development_dependency('rubocop-rspec', '~> 1.39.0')
   s.add_development_dependency('sqlite3', '~> 1.3')
 
   # For Documentation:
   s.add_development_dependency('rdoc', '>= 6.0')
   s.add_development_dependency('yard', '~> 0.9.10')
 
-  s.required_ruby_version = '>= 2.3.0'
+  s.required_ruby_version = '>= 2.4.0'
   s.rubygems_version = '>= 1.6.1'
   s.files            = `git ls-files`.split("\n")
   s.test_files       = `git ls-files -- {spec,features}/*`.split("\n")

data/dev_tasks/yard.rake

@@ -23,14 +23,6 @@ namespace :api do
   end
   task yard: :dir
 
-  task :release do
-    Dir.chdir(SITE_DIR) do
-      sh('git add .')
-      sh("git commit -m 'Update API docs for cucumber-rails v#{cucumber-rails::VERSION}'")
-      sh('git push origin master')
-    end
-  end
-
   desc "Generate YARD docs for Cucumber-Rails' API"
-  task doc: %i[yard release]
+  task doc: :yard
 end

data/features/allow_rescue.feature

@@ -20,7 +20,7 @@ Feature: Allow Cucumber to rescue exceptions
   Scenario: Allow rescue
     When I write to "features/posts.feature" with:
       """
-      Feature: posts
+      Feature: Posts
         @allow-rescue
         Scenario: See posts
           When I look at the posts
@@ -31,6 +31,7 @@ Feature: Allow Cucumber to rescue exceptions
       When('I look at the posts') do
         visit '/posts'
       end
+
       Then('I should see the public error page') do
         expect(page).to have_content "We're sorry, but something went wrong."
       end
@@ -46,7 +47,7 @@ Feature: Allow Cucumber to rescue exceptions
   Scenario: Don't allow rescue
     When I write to "features/posts.feature" with:
       """
-      Feature: posts
+      Feature: Posts
         Scenario: See them
           When I look at the posts
       """

data/features/choose_javascript_database_strategy.feature

@@ -37,7 +37,7 @@ Feature: Choose javascript database strategy
       end
 
       Then('the DatabaseCleaner strategy should be {word}') do |strategy_name|
-        expect(DatabaseCleaner.connections.first.strategy.to_s).to match(/#{strategy_name}/i)
+        expect(DatabaseCleaner.cleaners.values.first.strategy.to_s).to match(/#{strategy_name}/i)
       end
       """
 

data/features/step_definitions/cucumber_rails_steps.rb

@@ -26,7 +26,7 @@ Given('I remove the {string} gem from the Gemfile') do |gem_name|
   new_content = []
 
   content.each do |line|
-    next if line =~ /gem ["|']#{gem_name}["|'].*/
+    next if /gem ["|']#{gem_name}["|'].*/.match?(line)
 
     new_content << line
   end
@@ -61,7 +61,7 @@ When('I run the cukes') do
 end
 
 # Copied from Aruba
-Then(/^the feature run should pass with:$/) do |string|
+Then('the feature run should pass with:') do |string|
   step 'the output should not contain " failed)"'
   step 'the output should not contain " undefined)"'
   step 'the exit status should be 0'

data/features/support/aruba.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 Aruba.configure do |config|
-  config.exit_timeout = 120
+  config.exit_timeout = 360
 end

data/features/support/cucumber_rails_helper.rb

@@ -2,45 +2,32 @@
 
 module CucumberRailsHelper
   def rails_new(options = {})
-    options[:name] ||= 'test_app'
-    command_result =
-      run_command "bundle exec rails new #{options[:name]} --skip-bundle --skip-test-unit --skip-spring --skip-bootsnap #{options[:args]}"
-    expect(command_result).to have_output(/README/)
-    expect(last_command_started).to be_successfully_executed
-    cd options[:name]
-    delete_environment_variable 'RUBYOPT'
-    delete_environment_variable 'BUNDLE_BIN_PATH'
-    delete_environment_variable 'BUNDLE_GEMFILE'
+    validate_rails_new_success(run_rails_new_command(options))
+    clear_bundle_env_vars(options[:name])
   end
 
   def install_cucumber_rails(*options)
     add_conditional_gems(options)
 
-    gem 'selenium-webdriver', '~> 3.11', group: :test
-    gem 'rspec-expectations', '~> 3.7', group: :test
-    gem 'database_cleaner', '>= 1.1', group: :test unless options.include?(:no_database_cleaner)
-    gem 'factory_bot', '>= 3.2', group: :test unless options.include?(:no_factory_bot)
+    add_gem 'capybara', group: :test
+    add_gem 'selenium-webdriver', '~> 3.11', group: :test
+    add_gem 'rspec-expectations', '~> 3.7', group: :test
+    add_gem 'database_cleaner', '>= 1.8.0', group: :test unless options.include?(:no_database_cleaner)
+    add_gem 'factory_bot', '>= 3.2', group: :test unless options.include?(:no_factory_bot)
 
     run_command_and_stop 'bundle install'
     run_command_and_stop 'bundle exec rails webpacker:install' if rails6?
     run_command_and_stop 'bundle exec rails generate cucumber:install'
   end
 
-  def gem(name, *args)
-    options = args.last.is_a?(Hash) ? args.pop : {}
-
-    parts = ["'#{name}'"]
-    parts << args.map(&:inspect) if args.any?
-    parts << options.inspect[1..-2] if options.any?
-
-    line = "gem #{parts.join(', ')}\n"
-
+  def add_gem(name, *args)
+    line = convert_gem_opts_to_string(name, *args)
     gem_regexp = /gem ["']#{name}["'].*$/
     gemfile_content = File.read(expand_path('Gemfile'))
 
-    if gemfile_content =~ gem_regexp
-      gemfile_content.gsub!(gem_regexp, line)
-      overwrite_file('Gemfile', gemfile_content)
+    if gemfile_content&.match?(gem_regexp)
+      updated_gemfile_content = gemfile_content.gsub(gem_regexp, line)
+      overwrite_file('Gemfile', updated_gemfile_content)
     else
       append_to_file('Gemfile', line)
     end
@@ -48,28 +35,50 @@ module CucumberRailsHelper
 
   private
 
+  def run_rails_new_command(options)
+    options[:name] ||= 'test_app'
+    flags = '--skip-bundle --skip-test-unit --skip-spring --skip-bootsnap'
+    flags += ' --skip-webpack-install' if rails6?
+    run_command "bundle exec rails new #{options[:name]} #{flags} #{options[:args]}"
+  end
+
+  def validate_rails_new_success(result)
+    expect(result).to have_output(/README/)
+    expect(last_command_started).to be_successfully_executed
+  end
+
+  def clear_bundle_env_vars(dir)
+    cd dir
+    delete_environment_variable 'RUBYOPT'
+    delete_environment_variable 'BUNDLE_BIN_PATH'
+    delete_environment_variable 'BUNDLE_GEMFILE'
+  end
+
   def rails6?
     `bundle exec rails -v`.start_with?('Rails 6')
   end
 
   def add_conditional_gems(options)
     if options.include?(:not_in_test_group)
-      gem 'cucumber-rails', path: File.expand_path('.').to_s
+      add_gem 'cucumber-rails', path: File.expand_path('.').to_s
     else
-      gem 'cucumber-rails', group: :test, require: false, path: File.expand_path('.').to_s
+      add_gem 'cucumber-rails', group: :test, require: false, path: File.expand_path('.').to_s
     end
 
     if rails6?
-      gem 'sqlite3', '~> 1.4'
+      add_gem 'sqlite3', '~> 1.4'
     else
-      gem 'sqlite3', '~> 1.3.13'
+      add_gem 'sqlite3', '~> 1.3.13'
     end
+  end
 
-    if RUBY_VERSION < '2.4.0'
-      gem 'capybara', '< 3.16.0', group: :test
-    else
-      gem 'capybara', group: :test
-    end
+  def convert_gem_opts_to_string(name, *args)
+    options = args.last.is_a?(Hash) ? args.pop : {}
+    parts = ["'#{name}'"]
+    parts << args.map(&:inspect) if args.any?
+    parts << options.inspect[1..-2] if options.any?
+    new_parts = parts.flatten.map { |part| part.gsub(/:(\w+)=>/, '\1: ') }
+    "gem #{new_parts.join(', ')}\n"
   end
 end
 

data/lib/cucumber/rails.rb

@@ -10,18 +10,12 @@ if called_from_env_rb
   ENV['RAILS_ENV'] ||= 'test'
   ENV['RAILS_ROOT'] ||= File.expand_path(env_caller + '/../..')
   require File.expand_path(ENV['RAILS_ROOT'] + '/config/environment')
-  require 'cucumber/rails/action_controller'
+  require 'cucumber/rails/action_dispatch'
+  require 'rails/test_help'
 
-  if defined?(ActiveRecord::Base)
-    require 'rails/test_help'
-  else
-    require 'action_dispatch/testing/test_process'
-    require 'action_dispatch/testing/integration'
-  end
-
-  unless Rails.application.config.cache_classes
+  unless Rails.application.config.cache_classes || defined?(Spring)
     warn "WARNING: You have set Rails' config.cache_classes to false
-    (most likely in config/environments/cucumber.rb). This setting is known to cause problems
+    (Spring needs cache_classes set to false). This is known to cause problems
     with database transactions. Set config.cache_classes to true if you want to use transactions."
   end
 

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

@@ -53,7 +53,7 @@ module Cucumber
         end
 
         def mapped_keys
-          map.keys.join(',')
+          map.keys.join(', ')
         end
 
         def validate_interface!
@@ -76,7 +76,11 @@ module Cucumber
         end
 
         def before_js(strategy)
-          @original_strategy = DatabaseCleaner.connections.first.strategy # that feels like a nasty hack
+          @original_strategy = if Gem::Version.new(DatabaseCleaner::VERSION) >= Gem::Version.new('1.8.0.beta')
+                                 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
 

data/lib/cucumber/rails/hooks/active_record.rb

@@ -1,25 +1,23 @@
 # frozen_string_literal: true
 
-if defined?(ActiveRecord::Base)
-  module ActiveRecord
-    class Base
-      class_attribute :shared_connection
+module ActiveRecord
+  class Base
+    class_attribute :shared_connection
 
-      def self.connection
-        shared_connection || retrieve_connection
-      end
+    def self.connection
+      shared_connection || retrieve_connection
     end
   end
+end
 
-  Before('@javascript') do
-    Cucumber::Rails::Database.before_js if Cucumber::Rails::Database.autorun_database_cleaner
-  end
+Before('@javascript') do
+  Cucumber::Rails::Database.before_js if Cucumber::Rails::Database.autorun_database_cleaner
+end
 
-  Before('not @javascript') do
-    Cucumber::Rails::Database.before_non_js if Cucumber::Rails::Database.autorun_database_cleaner
-  end
+Before('not @javascript') do
+  Cucumber::Rails::Database.before_non_js if Cucumber::Rails::Database.autorun_database_cleaner
+end
 
-  After do
-    Cucumber::Rails::Database.after if Cucumber::Rails::Database.autorun_database_cleaner
-  end
+After do
+  Cucumber::Rails::Database.after if Cucumber::Rails::Database.autorun_database_cleaner
 end

data/lib/cucumber/rails/hooks/database_cleaner.rb

@@ -11,5 +11,5 @@ begin
     DatabaseCleaner.clean if Cucumber::Rails::Database.autorun_database_cleaner
   end
 rescue LoadError
-  # database_cleaner gem not present
+  Cucumber.logger.debug('database_cleaner gem not present.')
 end

data/lib/cucumber/rails/hooks/mail.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-if defined?(ActionMailer::Base)
-  Before do
-    ActionMailer::Base.deliveries = []
-  end
+Before do
+  ActionMailer::Base.deliveries = []
 end

data/lib/cucumber/rails/world.rb

@@ -4,7 +4,7 @@ begin
   # Try to load it so we can assign @_result below if needed.
   require 'test/unit/testresult'
 rescue LoadError
-  # Test Unit not found
+  Cucumber.logger.debug('Minitest not found.')
 end
 
 module Cucumber
@@ -20,7 +20,7 @@ end
 
 module Cucumber
   module Rails
-    class World < ActionDispatch::IntegrationTest
+    class World < ::ActionDispatch::IntegrationTest
       include Rack::Test::Methods if Cucumber::Rails.include_rack_test_helpers?
       include ActiveSupport::Testing::SetupAndTeardown if ActiveSupport::Testing.const_defined?('SetupAndTeardown')
 

data/spec/cucumber/rails/database_spec.rb

@@ -8,54 +8,63 @@ describe Cucumber::Rails::Database do
   let(:strategy) { instance_double(strategy_type, before_js: nil, before_non_js: nil) }
   let(:strategy_type) { Cucumber::Rails::Database::TruncationStrategy }
 
-  it 'forwards events to the selected strategy' do
-    described_class.javascript_strategy = :truncation
+  context 'when using a valid pre-determined strategy' do
+    before { described_class.javascript_strategy = :truncation }
 
-    expect(strategy).to receive(:before_non_js)
-    described_class.before_non_js
+    it 'forwards a `before_non_js` event to the selected strategy' do
+      expect(strategy).to receive(:before_non_js)
+
+      described_class.before_non_js
+    end
 
-    expect(strategy).to receive(:before_js)
-    described_class.before_js
+    it 'forwards a `before_js` event to the selected strategy' do
+      expect(strategy).to receive(:before_js)
+
+      described_class.before_js
+    end
   end
 
-  it 'raises an error if you use a non-understood strategy' do
-    expect { described_class.javascript_strategy = :invalid }
-      .to raise_error(Cucumber::Rails::Database::InvalidStrategy)
+  context 'when using an invalid pre-determined strategy' do
+    it 'raises an error if you use a non-understood strategy' do
+      expect { described_class.javascript_strategy = :invalid }
+        .to raise_error(Cucumber::Rails::Database::InvalidStrategy)
+    end
   end
 
-  context 'using a custom strategy' do
-    let(:strategy_type) { ValidStrategy }
+  context 'when using a valid custom strategy' do
+    before { described_class.javascript_strategy = strategy_type }
 
-    class ValidStrategy
-      def before_js
-        # Anything
-      end
+    let(:strategy_type) do
+      Class.new do
+        def before_js
+          # Anything
+        end
 
-      def before_non_js
-        # Likewise
+        def before_non_js
+          # Likewise
+        end
       end
     end
 
-    class InvalidStrategy; end
+    it 'forwards a `before_non_js` event to the strategy' do
+      expect(strategy).to receive(:before_non_js)
 
-    it 'raises an error if the strategy does not have a valid interface' do
-      expect { described_class.javascript_strategy = InvalidStrategy }
-        .to raise_error(ArgumentError)
+      described_class.before_non_js
     end
 
-    it 'accepts the strategy if it has a valid interface' do
-      expect { described_class.javascript_strategy = ValidStrategy }
-        .not_to raise_error
-    end
+    it 'forwards a `before_js` event to the strategy' do
+      expect(strategy).to receive(:before_js)
 
-    it 'forwards events to the strategy' do
-      described_class.javascript_strategy = ValidStrategy
+      described_class.before_js
+    end
+  end
 
-      expect(strategy).to receive(:before_non_js)
-      described_class.before_non_js
+  context 'when using an invalid custom strategy' do
+    let(:invalid_strategy) { Class.new }
 
-      expect(strategy).to receive(:before_js)
-      described_class.before_js
+    it 'raises an error if the strategy does not have a valid interface' do
+      expect { described_class.javascript_strategy = invalid_strategy }
+        .to raise_error(ArgumentError)
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cucumber-rails
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Aslak Hellesøy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-01 00:00:00.000000000 Z
+date: 2020-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -41,7 +41,7 @@ dependencies:
         version: 3.0.2
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -51,7 +51,7 @@ dependencies:
         version: 3.0.2
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
@@ -87,7 +87,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.8'
 - !ruby/object:Gem::Dependency
-  name: railties
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -121,33 +121,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.1.4
 - !ruby/object:Gem::Dependency
-  name: aruba
+  name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.4
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.4
+        version: '2.2'
 - !ruby/object:Gem::Dependency
-  name: appraisal
+  name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -162,26 +162,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '1.17'
-- !ruby/object:Gem::Dependency
-  name: rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '7'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -216,42 +196,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.72.0
+        version: 0.85.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.72.0
+        version: 0.85.0
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.6.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.6.1
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.33.0
+        version: 1.39.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.33.0
+        version: 1.39.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -305,7 +285,6 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
-- ".rubocop_todo.yml"
 - ".travis.yml"
 - Appraisals
 - CHANGELOG.md
@@ -352,7 +331,7 @@ files:
 - gemfiles/rails_5_2.gemfile
 - gemfiles/rails_6_0.gemfile
 - lib/cucumber/rails.rb
-- lib/cucumber/rails/action_controller.rb
+- lib/cucumber/rails/action_dispatch.rb
 - lib/cucumber/rails/application.rb
 - lib/cucumber/rails/capybara.rb
 - lib/cucumber/rails/capybara/javascript_emulation.rb
@@ -379,10 +358,15 @@ files:
 - spec/cucumber/rails/database_spec.rb
 - spec/generators/cucumber/install_generator_spec.rb
 - spec/spec_helper.rb
-homepage: http://cukes.info
+homepage: https://cucumber.io
 licenses:
 - MIT
-metadata: {}
+metadata:
+  bug_tracker_uri: https://github.com/cucumber/cucumber-rails/issues
+  changelog_uri: https://github.com/cucumber/cucumber-rails/blob/v2.1.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.1.0
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -391,16 +375,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.9
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
-summary: cucumber-rails-2.0.0
+summary: cucumber-rails-2.1.0
 test_files: []

data/.rubocop_todo.yml

@@ -1,59 +0,0 @@
-# This configuration was generated by
-# `rubocop --auto-gen-config`
-# on 2019-07-31 11:34:26 +0200 using RuboCop version 0.72.0.
-# The point is for the user to remove these configuration records
-# one by one as the offenses are removed from the code base.
-# Note that changes in the inspected code, or installation of new
-# versions of RuboCop, may require this file to be generated again.
-
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: AllowForAlignment.
-Layout/SpaceAroundOperators:
-  Exclude:
-    - 'dev_tasks/yard.rake'
-
-# Offense count: 2
-# Configuration parameters: AllowComments.
-Lint/HandleExceptions:
-  Exclude:
-    - 'lib/cucumber/rails/hooks/database_cleaner.rb'
-    - 'lib/cucumber/rails/world.rb'
-
-# Offense count: 3
-Metrics/AbcSize:
-  Max: 19
-
-# Offense count: 3
-# Configuration parameters: CountComments, ExcludedMethods.
-Metrics/MethodLength:
-  Max: 18
-
-# Offense count: 4
-# Configuration parameters: .
-# SupportedStyles: have_received, receive
-RSpec/MessageSpies:
-  EnforcedStyle: receive
-
-# Offense count: 2
-# Configuration parameters: AggregateFailuresByDefault.
-RSpec/MultipleExpectations:
-  Max: 2
-
-# Offense count: 1
-Style/DoubleNegation:
-  Exclude:
-    - 'lib/cucumber/rails/action_controller.rb'
-
-# Offense count: 1
-Style/MixinUsage:
-  Exclude:
-    - 'lib/cucumber/rails/rspec.rb'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedOctalStyle.
-# SupportedOctalStyles: zero_with_o, zero_only
-Style/NumericLiteralPrefix:
-  Exclude:
-    - 'lib/generators/cucumber/install_generator.rb'

data/lib/cucumber/rails/action_controller.rb

@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-ActionController::Base.class_eval do
-  cattr_accessor :allow_rescue
-end
-
-module ActionDispatch
-  class ShowExceptions
-    alias __cucumber_orig_call__ call
-
-    def call(env)
-      env['action_dispatch.show_exceptions'] = !!ActionController::Base.allow_rescue
-      env['action_dispatch.show_detailed_exceptions'] = !ActionController::Base.allow_rescue
-      __cucumber_orig_call__(env)
-    end
-  end
-end