cucumber-rails 1.8.0 → 2.5.0

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

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,13 +4,24 @@ 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
   module Rails
-    class World < ActionDispatch::IntegrationTest
-      include Rack::Test::Methods
+    class << self
+      def include_rack_test_helpers?
+        # Using ActiveModel Boolean casting here will give false positives more often than not!
+        !ENV['CR_REMOVE_RACK_TEST_HELPERS']&.casecmp('true')&.zero?
+      end
+    end
+  end
+end
+
+module Cucumber
+  module Rails
+    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')
 
       def initialize

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