cucumber-rails 1.5.0 → 2.1.0

data/lib/cucumber/rails/application.rb

@@ -1,17 +1,26 @@
+# frozen_string_literal: true
+
 require 'rails/application'
 
 # Make sure the ActionDispatch::ShowExceptions middleware is always enabled,
 # regardless of what is in config/environments/test.rb
 # Instead we are overriding ActionDispatch::ShowExceptions to be able to
 # toggle whether or not exceptions are raised.
-class Rails::Application
-  alias __cucumber_orig_initialize__ initialize!
 
-  def initialize!
-    ad = config.action_dispatch
-    def ad.show_exceptions
-      true
+module Cucumber
+  module Rails
+    module Application
+      def initialize!
+        ad = config.action_dispatch
+
+        def ad.show_exceptions
+          true
+        end
+
+        super
+      end
     end
-    __cucumber_orig_initialize__
   end
 end
+
+Rails::Application.prepend(Cucumber::Rails::Application)

data/lib/cucumber/rails/capybara.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'capybara'
 require 'capybara/rails'
 require 'capybara/cucumber'

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Cucumber
   module Rails
     module Capybara
@@ -9,9 +11,11 @@ module Cucumber
           end
         end
 
-        def click_with_javascript_emulation
+        def click_with_javascript_emulation(*)
           if link_with_non_get_http_method?
-            ::Capybara::RackTest::Form.new(driver, js_form(element_node.document, self[:href], emulated_method)).submit(self)
+            ::Capybara::RackTest::Form.new(
+              driver, js_form(element_node.document, self[:href], emulated_method)
+            ).submit(self)
           else
             click_without_javascript_emulation
           end
@@ -44,61 +48,65 @@ module Cucumber
           js_form['action'] = action
           js_form['method'] = method
 
-          if emulated_method and emulated_method.downcase != method.downcase
-            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.downcase != 'get'
-            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?
-          if ::Rails.version.to_f >= 3.0
-            tag_name == 'a' && element_node['data-method'] && element_node['data-method'] =~ /(?:delete|put|post)/
-          else
-            tag_name == 'a' && element_node['onclick'] && element_node['onclick'] =~ /var f = document\.createElement\('form'\); f\.style\.display = 'none';/
-          end
+          tag_name == 'a' &&
+            element_node['data-method'] &&
+            element_node['data-method'] =~ /(?:delete|put|post)/
         end
 
         def emulated_method
-          if ::Rails.version.to_f >= 3.0
-            element_node['data-method']
-          else
-            element_node['onclick'][/m\.setAttribute\('value', '([^']*)'\)/, 1]
-          end
+          element_node['data-method']
         end
 
         def element_node
-          if self.respond_to? :native
-            self.native
-          else
-            warn 'DEPRECATED: cucumber-rails loves you, just not your version of Capybara. Please update Capybara to >= 0.4.0'
-            self.node
-          end
+          native
         end
       end
     end
   end
 end
 
-class Capybara::RackTest::Node
-  include ::Cucumber::Rails::Capybara::JavascriptEmulation
+module Capybara
+  module RackTest
+    class Node
+      include ::Cucumber::Rails::Capybara::JavascriptEmulation
+    end
+  end
 end
 
-Before('~@no-js-emulation') do
+Before('not @no-js-emulation') do
   # Enable javascript emulation
   ::Capybara::RackTest::Node.class_eval do
     alias_method :click, :click_with_javascript_emulation

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

@@ -1,19 +1,21 @@
+# frozen_string_literal: true
+
 module Cucumber
   module Rails
     module Capybara
       # This module defines methods for selecting dates and times
       module SelectDatesAndTimes
-        # Select a Rails date. Options hash must include :from => +label+
+        # 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}_2i']").select(I18n.l(date, format: '%B'))
           find(:xpath, ".//select[@id='#{base_dom_id}_3i']").select(date.day.to_s)
         end
 
-        # Select a Rails time. Options hash must include :from => +label+
+        # 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])
@@ -22,7 +24,7 @@ module Cucumber
           find(:xpath, ".//select[@id='#{base_dom_id}_5i']").select(time.min.to_s.rjust(2,  '0'))
         end
 
-        # Select a Rails datetime. Options hash must include :from => +label+
+        # Select a Rails datetime. Options hash must include from: +label+
         def select_datetime(datetime, options)
           select_date(datetime, options)
           select_time(datetime, options)

data/lib/cucumber/rails/database.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 module Cucumber
   module Rails
     module Database
-      CUSTOM_STRATEGY_INTERFACE = %w{ before_js before_non_js }
+      CUSTOM_STRATEGY_INTERFACE = %w[before_js before_non_js].freeze
 
       class InvalidStrategy < ArgumentError; end
 
@@ -13,12 +15,12 @@ module Cucumber
           strategy_type =
             case strategy
             when Symbol
-              map[strategy] || raise(InvalidStrategy, "The strategy '#{strategy}' is not understood. Please use one of #{map.keys.join(',')}")
+              map[strategy] || throw_invalid_strategy_error(strategy)
             when Class
               strategy
             end
 
-          @strategy =  strategy_type.new(*strategy_opts)
+          @strategy = strategy_type.new(*strategy_opts)
 
           validate_interface!
         end
@@ -35,7 +37,7 @@ module Cucumber
           @strategy.after
         end
 
-      private
+        private
 
         def map
           {
@@ -46,10 +48,25 @@ module Cucumber
           }
         end
 
+        def throw_invalid_strategy_error(strategy)
+          raise(InvalidStrategy, "The strategy '#{strategy}' is not understood. Please use one of #{mapped_keys}")
+        end
+
+        def mapped_keys
+          map.keys.join(', ')
+        end
+
         def validate_interface!
-          unless CUSTOM_STRATEGY_INTERFACE.all? { |m| @strategy.respond_to?(m) }
-            raise(ArgumentError, "Strategy must respond to all of: #{CUSTOM_STRATEGY_INTERFACE.map{ |method| "##{method}" } * '  ' } !")
-          end
+          return if CUSTOM_STRATEGY_INTERFACE.all? { |m| @strategy.respond_to?(m) }
+
+          throw_invalid_strategy_interface_error
+        end
+
+        def throw_invalid_strategy_interface_error
+          raise(
+            ArgumentError,
+            "Strategy must respond to all of: #{CUSTOM_STRATEGY_INTERFACE.map { |method| "##{method}" } * '  '} !"
+          )
         end
       end
 
@@ -59,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
 
@@ -69,6 +90,7 @@ module Cucumber
 
         def after
           return unless @original_strategy
+
           DatabaseCleaner.strategy = @original_strategy
           @original_strategy = nil
         end

data/lib/cucumber/rails/hooks.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'cucumber/rails/hooks/active_record'
 require 'cucumber/rails/hooks/database_cleaner'
 require 'cucumber/rails/hooks/allow_rescue'

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

@@ -1,21 +1,23 @@
-if defined?(ActiveRecord::Base)
-  class ActiveRecord::Base
+# frozen_string_literal: true
+
+module ActiveRecord
+  class Base
     class_attribute :shared_connection
 
     def self.connection
-      self.shared_connection || retrieve_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('~@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/allow_rescue.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Before('@allow-rescue') do
   @__orig_allow_rescue = ActionController::Base.allow_rescue
   ActionController::Base.allow_rescue = true

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

@@ -1,13 +1,15 @@
+# frozen_string_literal: true
+
 begin
   require 'database_cleaner'
 
-  Before('~@no-database-cleaner') do
+  Before('not @no-database-cleaner') do
     DatabaseCleaner.start if Cucumber::Rails::Database.autorun_database_cleaner
   end
 
-  After('~@no-database-cleaner') do
+  After('not @no-database-cleaner') do
     DatabaseCleaner.clean if Cucumber::Rails::Database.autorun_database_cleaner
   end
-
-rescue LoadError => ignore_if_database_cleaner_not_present
+rescue LoadError
+  Cucumber.logger.debug('database_cleaner gem not present.')
 end

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

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

data/lib/cucumber/rails/rspec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'cucumber/rails/world'
 
 begin
@@ -8,7 +10,7 @@ begin
       include RSpec::Matchers
     end
   end
-rescue LoadError => try_rspec_1
+rescue LoadError
   require 'spec/expectations'
   require 'spec/rails'
 

data/lib/cucumber/rails/world.rb

@@ -1,21 +1,38 @@
+# frozen_string_literal: true
+
 begin
   # Try to load it so we can assign @_result below if needed.
   require 'test/unit/testresult'
-rescue LoadError => ignore
+rescue LoadError
+  Cucumber.logger.debug('Minitest not found.')
+end
+
+module Cucumber
+  module Rails
+    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 #:nodoc:
-  module Rails #:nodoc:
-    class World < ActionDispatch::IntegrationTest #:nodoc:
-      include Rack::Test::Methods
+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 #:nodoc:
+      def initialize
         @_result = Test::Unit::TestResult.new if defined?(Test::Unit::TestResult)
       end
 
       unless defined?(ActiveRecord::Base)
-        def self.fixture_table_names; []; end # Workaround for projects that don't use ActiveRecord
+        # Workaround for projects that don't use ActiveRecord
+        def self.fixture_table_names
+          []
+        end
       end
     end
   end

data/lib/generators/cucumber/{install/install_generator.rb → install_generator.rb}

@@ -1,13 +1,22 @@
+# frozen_string_literal: true
+
 require 'rbconfig'
 
 module Cucumber
   class InstallGenerator < ::Rails::Generators::Base
-    source_root File.expand_path('../templates', __FILE__)
+    source_root File.expand_path('templates', __dir__)
 
     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', aliases: '-D', default: false
+    class_option :spork,
+                 type: :boolean,
+                 desc: 'Use Spork'
+
+    class_option :skip_database,
+                 type: :boolean,
+                 desc: 'Skip modification of database.yml',
+                 aliases: '-D',
+                 default: false
 
     def create_templates
       template 'config/cucumber.yml.erb', 'config/cucumber.yml'
@@ -39,13 +48,13 @@ module Cucumber
 
     def create_database
       return unless File.exist?('config/database.yml')
-      unless File.read('config/database.yml').include? 'cucumber:'
-        gsub_file 'config/database.yml', /^test:.*\n/, "test: &test\n"
-        gsub_file 'config/database.yml', /\z/, "\ncucumber:\n  <<: *test\n"
+      return unless File.read('config/database.yml').include? 'cucumber:'
 
-        # Since gsub_file doesn't ask the user, just inform user that the file was overwritten.
-        puts '       force  config/database.yml'
-      end
+      gsub_file 'config/database.yml', /^test:.*\n/, "test: &test\n"
+      gsub_file 'config/database.yml', /\z/, "\ncucumber:\n  <<: *test\n"
+
+      # Since gsub_file doesn't ask the user, just inform user that the file was overwritten.
+      puts '       force  config/database.yml'
     end
 
     protected
@@ -60,7 +69,11 @@ module Cucumber
 
     def embed_template(source, indent = '')
       template = File.join(self.class.source_root, source)
-      ERB.new(IO.read(template), nil, '-').result(binding).gsub(/^/, indent)
+      if RUBY_VERSION >= '2.6'
+        ERB.new(IO.read(template), trim_mode: '-').result(binding).gsub(/^/, indent)
+      else
+        ERB.new(IO.read(template), nil, '-').result(binding).gsub(/^/, indent)
+      end
     end
   end
 end