cucumber-rails 1.7.0 → 1.8.0

data/features/support/env.rb

@@ -1,40 +1,14 @@
-$:.unshift(File.dirname(__FILE__) + '/../../lib')
+# frozen_string_literal: true
+
+$LOAD_PATH.unshift(File.dirname(__FILE__) + '/../../lib')
 require 'rubygems'
 require 'bundler/setup'
 require 'rspec/expectations'
 require 'aruba/cucumber'
 
-if(ENV['ARUBA_REPORT_DIR'])
-  # Override reporting behaviour so we don't document all files, only the ones
-  # that have been created after @aruba_report_start (a Time object). This is
-  # given a value after the Rails app is generated (see cucumber_rails_steps.rb)
-  module Aruba
-    module Reporting
-      def children(dir)
-        children = Dir["#{dir}/*"].sort
-
-        # include
-        children = children.select do |child|
-          File.directory?(child) ||
-          (@aruba_report_start && File.stat(child).mtime > @aruba_report_start)
-        end
-
-        # exclude
-        children = children.reject do |child|
-          child =~ /Gemfile/ ||
-          child =~ /\.log$/
-        end
-
-        children
-      end
-    end
-  end
-end
-
 After do |scenario|
   if scenario.failed?
     puts last_command_stopped.stdout
     puts last_command_stopped.stderr
   end
- end
- 
+end

data/features/support/legacy_web_steps_support.rb

@@ -283,7 +283,7 @@ module NavigationHelpers
 end
 
 World(NavigationHelpers)
-EOF
+    EOF
   end
 end
 World(WebSteps)

data/gemfiles/rails_4_2.gemfile

@@ -2,9 +2,9 @@
 
 source "https://rubygems.org"
 
-gem "railties", "~> 4.2.1"
-gem "i18n", "< 1.5.1", platform: :mri_22
-gem "capybara", "< 3.16.0", platform: [:mri_23, :mri_22]
-gem "nokogiri", "< 1.9.1", platform: [:mri_23, :mri_22]
+gem "capybara", "< 3.16.0", platform: :mri_23
+gem "nokogiri", "< 1.9.1", platform: :mri_23
+gem "railties", "~> 4.2.11"
+gem "sqlite3", "~> 1.3.13"
 
 gemspec path: "../"

data/gemfiles/rails_5_0.gemfile

@@ -2,9 +2,9 @@
 
 source "https://rubygems.org"
 
-gem "railties", "~> 5.0.0"
-gem "i18n", "< 1.5.1", platform: :mri_22
-gem "capybara", "< 3.16.0", platform: [:mri_23, :mri_22]
-gem "nokogiri", "< 1.9.1", platform: [:mri_23, :mri_22]
+gem "capybara", "< 3.16.0", platform: :mri_23
+gem "nokogiri", "< 1.9.1", platform: :mri_23
+gem "railties", "~> 5.0.7"
+gem "sqlite3", "~> 1.3.13"
 
 gemspec path: "../"

data/gemfiles/rails_5_1.gemfile

@@ -2,9 +2,9 @@
 
 source "https://rubygems.org"
 
+gem "capybara", "< 3.16.0", platform: :mri_23
+gem "nokogiri", "< 1.9.1", platform: :mri_23
 gem "railties", "~> 5.1.0"
-gem "i18n", "< 1.5.1", platform: :mri_22
-gem "capybara", "< 3.16.0", platform: [:mri_23, :mri_22]
-gem "nokogiri", "< 1.9.1", platform: [:mri_23, :mri_22]
+gem "sqlite3", "~> 1.3.13"
 
 gemspec path: "../"

data/gemfiles/rails_5_2.gemfile

@@ -2,9 +2,9 @@
 
 source "https://rubygems.org"
 
-gem "railties", "~> 5.2"
-gem "i18n", "< 1.5.1", platform: :mri_22
-gem "capybara", "< 3.16.0", platform: [:mri_23, :mri_22]
-gem "nokogiri", "< 1.9.1", platform: [:mri_23, :mri_22]
+gem "capybara", "< 3.16.0", platform: :mri_23
+gem "nokogiri", "< 1.9.1", platform: :mri_23
+gem "railties", "~> 5.2.3"
+gem "sqlite3", "~> 1.3.13"
 
 gemspec path: "../"

data/gemfiles/rails_6_0.gemfile

@@ -2,7 +2,8 @@
 
 source "https://rubygems.org"
 
-gem "railties", "~> 6.0.0.beta1"
-gem "rails", "~> 6.0.0.beta1"
+gem "railties", "~> 6.0.0.rc2"
+gem "rails", "~> 6.0.0.rc2"
+gem "sqlite3", "~> 1.4"
 
 gemspec path: "../"

data/lib/cucumber/rails.rb

@@ -1,5 +1,10 @@
-env_caller = File.dirname(caller.detect{ |f| f =~ /\/env\.rb:/ }) if caller.detect{ |f| f =~ /\/env\.rb:/ }
-if env_caller
+# frozen_string_literal: true
+
+called_from_env_rb = caller.detect { |f| f =~ /\/env\.rb:/ }
+
+if called_from_env_rb
+  env_caller = File.dirname(called_from_env_rb)
+
   require 'rails'
   require 'cucumber/rails/application'
   ENV['RAILS_ENV'] ||= 'test'
@@ -15,7 +20,9 @@ if env_caller
   end
 
   unless Rails.application.config.cache_classes
-    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 with database transactions. Set config.cache_classes to true if you want to use transactions."
+    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
+    with database transactions. Set config.cache_classes to true if you want to use transactions."
   end
 
   require 'cucumber/rails/world'
@@ -25,7 +32,8 @@ if env_caller
 
   MultiTest.disable_autorun
 else
-  warn "WARNING: Cucumber-rails required outside of env.rb.  The rest of loading is being deferred until env.rb is called.
-  To avoid this warning, move 'gem \'cucumber-rails\', require: false' under only group :test in your Gemfile.
-  If already in the :test group, be sure you are specifying 'require: false'."
+  warn "WARNING: Cucumber-rails required outside of env.rb.  The rest of loading is being deferred
+  until env.rb is called. To avoid this warning, move 'gem \'cucumber-rails\', require: false'
+  under only group :test in your Gemfile. If already in the :test group, be sure you are
+  specifying 'require: false'."
 end

data/lib/cucumber/rails/action_controller.rb

@@ -1,13 +1,17 @@
+# frozen_string_literal: true
+
 ActionController::Base.class_eval do
   cattr_accessor :allow_rescue
 end
 
-class ActionDispatch::ShowExceptions
-  alias __cucumber_orig_call__ call
+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)
+    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

data/lib/cucumber/rails/application.rb

@@ -1,17 +1,23 @@
+# 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 Rails
+  class Application
+    alias __cucumber_orig_initialize__ initialize!
+
+    def initialize!
+      ad = config.action_dispatch
+
+      def ad.show_exceptions
+        true
+      end
+      __cucumber_orig_initialize__
     end
-    __cucumber_orig_initialize__
   end
 end

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,7 +48,7 @@ module Cucumber
           js_form['action'] = action
           js_form['method'] = method
 
-          if emulated_method and emulated_method.downcase != method.downcase
+          if emulated_method && !emulated_method.casecmp(method).zero?
             input = document.create_element('input')
             input['type'] = 'hidden'
             input['name'] = '_method'
@@ -54,7 +58,7 @@ module Cucumber
 
           # rails will wipe the session if the CSRF token is not sent
           # with non-GET requests
-          if csrf? && emulated_method.downcase != 'get'
+          if csrf? && !emulated_method.casecmp('get').zero?
             input = document.create_element('input')
             input['type'] = 'hidden'
             input['name'] = csrf_param
@@ -66,7 +70,9 @@ module Cucumber
         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 +80,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,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
 
@@ -69,6 +86,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,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,3 +1,5 @@
+# frozen_string_literal: true
+
 begin
   require 'database_cleaner'
 
@@ -8,6 +10,6 @@ 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
+rescue LoadError
+  # database_cleaner gem not present
 end

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

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

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,27 @@
+# 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
+  # Test Unit not found
 end
 
-module Cucumber #:nodoc:
-  module Rails #:nodoc:
-    class World < ActionDispatch::IntegrationTest #:nodoc:
+module Cucumber
+  module Rails
+    class World < ActionDispatch::IntegrationTest
       include Rack::Test::Methods
       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