cucumber-rails 1.7.0 → 2.3.0

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

@@ -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
@@ -11,7 +13,9 @@ module Cucumber
 
         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,29 +48,42 @@ 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?
-          tag_name == 'a' && element_node['data-method'] && element_node['data-method'] =~ /(?:delete|put|post)/
+          tag_name == 'a' &&
+            element_node['data-method'] &&
+            element_node['data-method'] =~ /(?:delete|put|post)/
         end
 
         def emulated_method
@@ -74,15 +91,19 @@ module Cucumber
         end
 
         def element_node
-          self.native
+          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('not @no-js-emulation') do

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Cucumber
   module Rails
     module Capybara
@@ -9,7 +11,7 @@ module Cucumber
           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
 

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,16 +15,21 @@ 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
 
+        def default_strategy!
+          self.javascript_strategy = :truncation
+          self.autorun_database_cleaner = true
+        end
+
         def before_js
           @strategy.before_js
         end
@@ -35,7 +42,7 @@ module Cucumber
           @strategy.after
         end
 
-      private
+        private
 
         def map
           {
@@ -46,68 +53,29 @@ module Cucumber
           }
         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
-        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
+        def throw_invalid_strategy_error(strategy)
+          raise(InvalidStrategy, "The strategy '#{strategy}' is not understood. Please use one of #{mapped_keys}")
         end
-      end
 
-      class TruncationStrategy < Strategy
-        def before_js
-          super :truncation
+        def mapped_keys
+          map.keys.join(', ')
         end
-      end
 
-      class DeletionStrategy < Strategy
-        def before_js
-          super :deletion
-        end
-      end
+        def validate_interface!
+          return if CUSTOM_STRATEGY_INTERFACE.all? { |m| @strategy.respond_to?(m) }
 
-      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
+          throw_invalid_strategy_interface_error
         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
+        def throw_invalid_strategy_interface_error
+          raise(
+            ArgumentError,
+            "Strategy must respond to all of: #{CUSTOM_STRATEGY_INTERFACE.map { |method| "##{method}" } * '  '} !"
+          )
         end
       end
 
-      Database.javascript_strategy = :truncation
-      Database.autorun_database_cleaner = true
+      default_strategy!
     end
   end
 end

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

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Cucumber
+  module Rails
+    module Database
+      class DeletionStrategy < Strategy
+        def before_js
+          super :deletion
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Cucumber
+  module Rails
+    module Database
+      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
+    end
+  end
+end

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

@@ -0,0 +1,33 @@
+# 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')
+                                 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/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,9 +1,13 @@
+# frozen_string_literal: true
+
 if defined?(ActiveRecord::Base)
-  class ActiveRecord::Base
-    class_attribute :shared_connection
+  module ActiveRecord
+    class Base
+      class_attribute :shared_connection
 
-    def self.connection
-      self.shared_connection || retrieve_connection
+      def self.connection
+        shared_connection || retrieve_connection
+      end
     end
   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,6 +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
@@ -8,6 +18,4 @@ begin
   After('not @no-database-cleaner') do
     DatabaseCleaner.clean if Cucumber::Rails::Database.autorun_database_cleaner
   end
-
-rescue LoadError => ignore_if_database_cleaner_not_present
 end