cucumber-rails 2.0.0 → 2.5.1

data/lib/cucumber/rails/database.rb

@@ -25,6 +25,11 @@ module Cucumber
           validate_interface!
         end
 
+        def default_strategy!
+          self.javascript_strategy = :truncation
+          self.autorun_database_cleaner = true
+        end
+
         def before_js
           @strategy.before_js
         end
@@ -44,7 +49,8 @@ module Cucumber
             truncation: TruncationStrategy,
             shared_connection: SharedConnectionStrategy,
             transaction: SharedConnectionStrategy,
-            deletion: DeletionStrategy
+            deletion: DeletionStrategy,
+            none: NullStrategy
           }
         end
 
@@ -53,7 +59,7 @@ module Cucumber
         end
 
         def mapped_keys
-          map.keys.join(',')
+          map.keys.join(', ')
         end
 
         def validate_interface!
@@ -70,62 +76,7 @@ module Cucumber
         end
       end
 
-      class Strategy
-        def initialize(options = {})
-          @options = options
-        end
-
-        def before_js(strategy)
-          @original_strategy = DatabaseCleaner.connections.first.strategy # that feels like a nasty hack
-          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
-
-      class TruncationStrategy < Strategy
-        def before_js
-          super :truncation
-        end
-      end
-
-      class DeletionStrategy < Strategy
-        def before_js
-          super :deletion
-        end
-      end
-
-      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
-
-      Database.javascript_strategy = :truncation
-      Database.autorun_database_cleaner = true
+      default_strategy!
     end
   end
 end

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

@@ -1,8 +1,16 @@
 # frozen_string_literal: true
 
 begin
-  require 'database_cleaner'
+  require 'database_cleaner/core'
+rescue LoadError
+  begin
+    require 'database_cleaner'
+  rescue LoadError
+    Cucumber.logger.debug('neither database_cleaner v1 or v2 present')
+  end
+end
 
+if defined?(DatabaseCleaner)
   Before('not @no-database-cleaner') do
     DatabaseCleaner.start if Cucumber::Rails::Database.autorun_database_cleaner
   end
@@ -10,6 +18,4 @@ begin
   After('not @no-database-cleaner') do
     DatabaseCleaner.clean if Cucumber::Rails::Database.autorun_database_cleaner
   end
-rescue LoadError
-  # database_cleaner gem not present
 end

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-if defined?(ActionMailer::Base)
+if defined?(::ActionMailer)
   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/lib/cucumber/rails.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-called_from_env_rb = caller.detect { |f| f =~ /\/env\.rb:/ }
+called_from_env_rb = caller.detect { |f| f.include? '/env.rb:' }
 
 if called_from_env_rb
   env_caller = File.dirname(called_from_env_rb)
@@ -8,26 +8,25 @@ if called_from_env_rb
   require 'rails'
   require 'cucumber/rails/application'
   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'
+  ENV['RAILS_ROOT'] ||= File.expand_path("#{env_caller}/../..")
+  require File.expand_path("#{ENV['RAILS_ROOT']}/config/environment")
+  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
 
   require 'cucumber/rails/world'
   require 'cucumber/rails/hooks'
   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'
 
   MultiTest.disable_autorun

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cucumber-rails
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.5.1
 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: 2022-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.12'
+        version: '2.18'
     - - "<"
       - !ruby/object:Gem::Version
         version: '4'
@@ -28,7 +28,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.12'
+        version: '2.18'
     - - "<"
       - !ruby/object:Gem::Version
         version: '4'
@@ -38,74 +38,96 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.2
+        version: '3.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.2
+        version: '3.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '8'
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.0'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '3.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.0'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '3.3'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '1.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '1.10'
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '8'
+- !ruby/object:Gem::Dependency
+  name: rexml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: webrick
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: ammeter
   requirement: !ruby/object:Gem::Requirement
@@ -121,33 +143,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.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.14.4
+        version: '2.4'
 - !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
@@ -163,25 +185,25 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.17'
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '1.8'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '1.8'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -216,42 +238,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.72.0
+        version: 1.24.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.24.0
+- !ruby/object:Gem::Dependency
+  name: rubocop-packaging
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.72.0
+        version: 0.5.1
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.10.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.10.2
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.33.0
+        version: 2.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.33.0
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -300,64 +336,22 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".github/ISSUE_TEMPLATE.md"
-- ".github/PULL_REQUEST_TEMPLATE.md"
-- ".gitignore"
-- ".rspec"
-- ".rubocop.yml"
-- ".rubocop_todo.yml"
-- ".travis.yml"
-- Appraisals
 - CHANGELOG.md
 - CONTRIBUTING.md
-- Gemfile
 - LICENSE
 - README.md
-- Rakefile
-- bin/install_geckodriver.sh
-- bin/install_webpacker.sh
-- config/.gitignore
-- config/cucumber.yml
-- cucumber-rails.gemspec
-- dev_tasks/cucumber.rake
-- dev_tasks/rspec.rake
-- dev_tasks/yard.rake
-- dev_tasks/yard/default/layout/html/bubble_32x32.png
-- dev_tasks/yard/default/layout/html/footer.erb
-- dev_tasks/yard/default/layout/html/index.erb
-- dev_tasks/yard/default/layout/html/layout.erb
-- dev_tasks/yard/default/layout/html/logo.erb
-- dev_tasks/yard/default/layout/html/setup.rb
-- features/allow_rescue.feature
-- features/annotations.feature
-- features/capybara_javascript_drivers.feature
-- features/choose_javascript_database_strategy.feature
-- features/configuration.feature
-- features/database_cleaner.feature
-- features/disable_automatic_database_cleaning.feature
-- features/emulate_javascript.feature
-- features/install_cucumber_rails.feature
-- features/no_database.feature
-- features/raising_errors.feature
-- features/rerun_profile.feature
-- features/rest_api.feature
-- features/step_definitions/cucumber_rails_steps.rb
-- features/support/aruba.rb
-- features/support/cucumber_rails_helper.rb
-- features/support/env.rb
-- features/support/hooks.rb
-- gemfiles/rails_4_2.gemfile
-- gemfiles/rails_5_0.gemfile
-- gemfiles/rails_5_1.gemfile
-- 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
 - 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
 - lib/cucumber/rails/hooks.rb
 - lib/cucumber/rails/hooks/active_record.rb
 - lib/cucumber/rails/hooks/allow_rescue.rb
@@ -374,15 +368,16 @@ files:
 - lib/generators/cucumber/templates/support/capybara.rb
 - lib/generators/cucumber/templates/support/edit_warning.txt
 - lib/generators/cucumber/templates/support/rails.rb.erb
-- lib/generators/cucumber/templates/support/rails_spork.rb.erb
 - lib/generators/cucumber/templates/tasks/cucumber.rake.erb
-- 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.5.1/CHANGELOG.md
+  documentation_uri: https://cucumber.io/docs
+  mailing_list_uri: https://groups.google.com/forum/#!forum/cukes
+  source_code_uri: https://github.com/cucumber/cucumber-rails/tree/v2.5.1
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -391,16 +386,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.6.1
 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.5.1
 test_files: []