cucumber-rails 1.4.0 → 1.4.1

data/features/choose_javascript_database_strategy.feature

@@ -141,4 +141,4 @@ Feature: Choose javascript database strategy
        """
        2 scenarios (2 passed)
        3 steps (3 passed)
-       """
+       """

data/features/database_cleaner.feature

@@ -7,7 +7,7 @@ Feature: DatabaseCleaner
       Feature: Create widgets
         Background: some widdgets
           Given I have 2 widgets
-      
+
         Scenario: Add 3
           When I create 3 more widgets
           Then I should have 5 widgets

data/features/disable_automatic_database_cleaning.feature

@@ -52,4 +52,4 @@ Feature: Disable automatic database cleaning
        """
        2 scenarios (2 passed)
        4 steps (4 passed)
-       """
+       """

data/features/install_cucumber_rails.feature

@@ -9,5 +9,6 @@ Feature: Rails
       | config/cucumber.yml                    |
       | script/cucumber                        |
       | features/support/env.rb                |
+      | features/step_definitions/.gitkeep     |
       | lib/tasks/cucumber.rake                |
-    And the file "features/support/env.rb" should contain "require 'cucumber/rails'"
+    And the file "features/support/env.rb" should contain "require 'cucumber/rails'"

data/features/raising_errors.feature

@@ -13,4 +13,4 @@ Feature: Raise Errors
       """
       1 scenario (1 failed)
       1 step (1 failed)
-      """
+      """

data/features/rerun_profile.feature

@@ -34,4 +34,4 @@ Feature: Rerun profile
       1 scenario (1 passed)
       1 step (1 passed)
       """
-    And the file "rerun.txt" should not contain "features/rerun_test.feature:2"    
+    And the file "rerun.txt" should not contain "features/rerun_test.feature:2"

data/features/step_definitions/cucumber_rails_steps.rb

@@ -1,37 +1,37 @@
 module CucumberRailsHelper
-  def rails_new(options={})
+  def rails_new(options = {})
     options[:name] ||= 'test_app'
-    run_simple "bundle exec rails new #{options[:name]} --skip-test-unit #{options[:args]}"
+    run_simple "bundle exec rails new #{options[:name]} --skip-test-unit --skip-spring #{options[:args]}"
     assert_passing_with('README')
     cd options[:name]
   end
 
   def install_cucumber_rails(*options)
     if options.include?(:not_in_test_group)
-      gem "cucumber-rails", :path => "#{File.expand_path('.')}"
+      gem 'cucumber-rails', path: "#{File.expand_path('.')}"
     else
-      gem "cucumber-rails", :group => :test, :require => false, :path => "#{File.expand_path('.')}"
+      gem 'cucumber-rails' , group: :test, require: false, path: "#{File.expand_path('.')}"
     end
-    gem "capybara", :group => :test
-    gem "rspec-rails", :group => :test
-    gem "database_cleaner", :group => :test unless options.include?(:no_database_cleaner)
-    gem 'factory_girl', :group => :test unless options.include?(:no_factory_girl)
-    gem "selenium-webdriver", :group => :test
-    run_simple "bundle exec rails generate cucumber:install"
+    gem 'capybara', group: :test
+    gem 'rspec-rails', group: :test
+    gem 'database_cleaner', group: :test unless options.include?(:no_database_cleaner)
+    gem 'factory_girl', group: :test unless options.include?(:no_factory_girl)
+    gem 'selenium-webdriver', group: :test
+    run_simple 'bundle exec rails generate cucumber:install'
   end
-  
+
   def gem(name, options)
     line = %{gem "#{name}", #{options.inspect}\n}
     append_to_file('Gemfile', line)
   end
-  
+
   def prepare_aruba_report
     if(ENV['ARUBA_REPORT_DIR'])
       @aruba_report_start = Time.new
       sleep(1)
     end
   end
-  
+
   def fixture(path)
     File.expand_path(File.dirname(__FILE__) + "./../support/fixtures/#{path}")
   end
@@ -46,7 +46,7 @@ Given /^I have created a new Rails app and installed cucumber\-rails, accidental
 end
 
 Given /^I have created a new Rails app "([^"]*)" and installed cucumber\-rails$/ do |app_name|
-  rails_new :name => app_name
+  rails_new name: app_name
   install_cucumber_rails
   create_web_steps
   prepare_aruba_report
@@ -60,14 +60,14 @@ Given /^I have created a new Rails app and installed cucumber\-rails$/ do
 end
 
 Given /^I have created a new Rails app with no database and installed cucumber-rails$/ do
-  rails_new :args => '--skip-active-record'
+  rails_new args: '--skip-active-record'
   install_cucumber_rails :no_database_cleaner, :no_factory_girl
   overwrite_file('features/support/env.rb', "require 'cucumber/rails'\n")
   create_web_steps
 end
 
 Given /^I have created a new Rails app "(.*?)" with no database and installed cucumber\-rails$/ do |app_name|
-  rails_new :name => app_name, :args => '--skip-active-record'
+  rails_new name: app_name, args: '--skip-active-record'
   install_cucumber_rails :no_database_cleaner, :no_factory_girl
   overwrite_file('features/support/env.rb', "require 'cucumber/rails'\n")
   create_web_steps
@@ -75,7 +75,7 @@ end
 
 Given /^I have a "([^"]*)" ActiveRecord model object$/ do |name|
   run_simple("bundle exec rails g model #{name}")
-  run_simple("bundle exec rake db:migrate RAILS_ENV=test")
+  run_simple('bundle exec rake db:migrate RAILS_ENV=test')
 end
 
 When /^I run the cukes$/ do

data/features/support/bundler_pre_support.rb

@@ -2,11 +2,11 @@ module BundlerPreHelper
   def bundler
     fixture 'bundler-1.0.21.gem'
   end
-  
+
   def bundler_pre
     fixture 'bundler-1.1.rc.gem'
   end
-  
+
   def gem_install(path)
     run_simple("gem install #{path} --no-ri --no-rdoc")
   end

data/features/support/env.rb

@@ -17,16 +17,16 @@ if(ENV['ARUBA_REPORT_DIR'])
     module Reporting
       def children(dir)
         children = Dir["#{dir}/*"].sort
-        
+
         # include
         children = children.select do |child|
-          File.directory?(child) || 
+          File.directory?(child) ||
           (@aruba_report_start && File.stat(child).mtime > @aruba_report_start)
         end
-        
+
         # exclude
         children = children.reject do |child|
-          child =~ /Gemfile/ || 
+          child =~ /Gemfile/ ||
           child =~ /\.log$/
         end
 

data/features/support/legacy_web_steps_support.rb

@@ -235,7 +235,7 @@ Then /^(?:|I )should have the following query string:$/ do |expected_pairs|
   query = URI.parse(current_url).query
   actual_params = query ? CGI.parse(query) : {}
   expected_params = {}
-  expected_pairs.rows_hash.each_pair{|k,v| expected_params[k] = v.split(',')} 
+  expected_pairs.rows_hash.each_pair{|k,v| expected_params[k] = v.split(',')}
 
   if actual_params.respond_to? :should
     actual_params.should == expected_params
@@ -248,7 +248,7 @@ Then /^show me the page$/ do
   save_and_open_page
 end
     EOF
-    
+
     write_file('features/support/paths.rb', <<-EOF)
 module NavigationHelpers
   # Maps a name to a path. Used by the
@@ -287,4 +287,3 @@ EOF
   end
 end
 World(WebSteps)
-

data/gemfiles/capybara_1_1.gemfile

@@ -5,13 +5,12 @@ source "https://rubygems.org"
 gem "capybara", "~> 1.1.2"
 gem "rails", "~> 3.2.12"
 gem "turn", "~> 0.9.6"
-gem "rspec-rails", "~> 2.12.2"
+gem "rspec-rails", "~> 2.14.2"
 gem "sass-rails", "~> 3.2.6"
 gem "coffee-rails", "~> 3.2.2"
 gem "jquery-rails", "~> 2.2.1"
 gem "uglifier", "~> 2.1.0"
 gem "sqlite3", "~> 1.3.7"
-gem "bson_ext", "~> 1.8.5"
 gem "database_cleaner", "~> 1.0.1"
 
-gemspec :path=>"../"
+gemspec :path => "../"

data/gemfiles/rails_3_0.gemfile

@@ -5,12 +5,10 @@ source "https://rubygems.org"
 gem "rails", "~> 3.0.20"
 gem "capybara", "~> 2.0.2"
 gem "turn", "~> 0.9.6"
-gem "rspec-rails", "~> 2.12.2"
+gem "rspec-rails", "~> 2.14.2"
 gem "jquery-rails", "~> 2.2.1"
 gem "uglifier", "~> 2.1.0"
 gem "sqlite3", "~> 1.3.7"
-gem "bson_ext", "~> 1.8.5"
-gem "mongoid", "~> 2.2.6"
 gem "database_cleaner", "~> 1.0.1"
 
-gemspec :path=>"../"
+gemspec :path => "../"

data/gemfiles/rails_3_1.gemfile

@@ -5,13 +5,12 @@ source "https://rubygems.org"
 gem "rails", "~> 3.1.11"
 gem "capybara", "~> 2.0.2"
 gem "turn", "~> 0.9.6"
-gem "rspec-rails", "~> 2.12.2"
+gem "rspec-rails", "~> 2.14.2"
 gem "sass-rails", "~> 3.1.7"
 gem "coffee-rails", "~> 3.1.1"
 gem "jquery-rails", "~> 2.2.1"
 gem "uglifier", "~> 2.1.0"
 gem "sqlite3", "~> 1.3.7"
-gem "bson_ext", "~> 1.8.5"
 gem "database_cleaner", "~> 1.0.1"
 
-gemspec :path=>"../"
+gemspec :path => "../"

data/gemfiles/rails_3_2.gemfile

@@ -5,13 +5,12 @@ source "https://rubygems.org"
 gem "rails", "~> 3.2.12"
 gem "capybara", "~> 2.0.2"
 gem "turn", "~> 0.9.6"
-gem "rspec-rails", "~> 2.12.2"
+gem "rspec-rails", "~> 2.14.2"
 gem "sass-rails", "~> 3.2.6"
 gem "coffee-rails", "~> 3.2.2"
 gem "jquery-rails", "~> 2.2.1"
 gem "uglifier", "~> 2.1.0"
 gem "sqlite3", "~> 1.3.7"
-gem "bson_ext", "~> 1.8.5"
 gem "database_cleaner", "~> 1.0.1"
 
-gemspec :path=>"../"
+gemspec :path => "../"

data/gemfiles/rails_4_0.gemfile

@@ -7,14 +7,12 @@ gem "rails", "~> 4.0.0"
 gem "railties", "~> 4.0.0"
 gem "capybara", "~> 2.0.2"
 gem "turn", "~> 0.9.6"
-gem "rspec-rails", "~> 2.12.2"
+gem "rspec-rails", "~> 2.14.2"
 gem "sass-rails", "~> 4.0.0"
 gem "coffee-rails", "~> 4.0.0"
 gem "jquery-rails", "~> 2.2.1"
 gem "uglifier", "~> 2.1.0"
 gem "sqlite3", "~> 1.3.7"
-gem "bson_ext", "~> 1.8.5"
-gem "mongoid", :git=>"https://github.com/mongoid/mongoid.git"
 gem "database_cleaner", "~> 1.0.1"
 
-gemspec :path=>"../"
+gemspec :path => "../"

data/gemfiles/rails_4_1.gemfile

@@ -0,0 +1,18 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "protected_attributes", "~> 1.0.3"
+gem "rails", "~> 4.1.0"
+gem "railties", "~> 4.1.0"
+gem "capybara", "~> 2.0.2"
+gem "turn", "~> 0.9.6"
+gem "rspec-rails", "~> 2.14.2"
+gem "sass-rails", "~> 4.0.0"
+gem "coffee-rails", "~> 4.0.0"
+gem "jquery-rails", "~> 2.2.1"
+gem "uglifier", "~> 2.1.0"
+gem "sqlite3", "~> 1.3.7"
+gem "database_cleaner", "~> 1.0.1"
+
+gemspec :path => "../"

data/lib/cucumber/rails.rb

@@ -1,10 +1,10 @@
-env_caller = File.dirname(caller.detect{|f| f =~ /\/env\.rb:/}) if caller.detect{|f| f =~ /\/env\.rb:/}
+env_caller = File.dirname(caller.detect{ |f| f =~ /\/env\.rb:/ }) if caller.detect{ |f| f =~ /\/env\.rb:/ }
 if env_caller
   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')
+  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'
 
   if defined?(ActiveRecord::Base)
@@ -14,8 +14,8 @@ if env_caller
     require 'action_dispatch/testing/integration'
   end
 
-  if !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.  For more information see https://rspec.lighthouseapp.com/projects/16211/tickets/165."
+  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."
   end
 
   require 'cucumber/rails/world'
@@ -23,8 +23,9 @@ if env_caller
   require 'cucumber/rails/capybara'
   require 'cucumber/rails/database'
 
+  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. 
+  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

@@ -4,9 +4,9 @@ end
 
 class ActionDispatch::ShowExceptions
   alias __cucumber_orig_call__ call
-  
+
   def call(env)
     env['action_dispatch.show_exceptions'] = !!ActionController::Base.allow_rescue
     __cucumber_orig_call__(env)
   end
-end
+end

data/lib/cucumber/rails/application.rb

@@ -6,7 +6,7 @@ require 'rails/application'
 # 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

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

@@ -8,7 +8,7 @@ module Cucumber
             alias_method :click, :click_with_javascript_emulation
           end
         end
-  
+
         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)
@@ -54,14 +54,14 @@ 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.downcase != 'get'
             input = document.create_element('input')
             input['type'] = 'hidden'
             input['name'] = csrf_param
             input['value'] = csrf_token
             js_form.add_child(input)
           end
-        
+
           js_form
         end
 
@@ -85,7 +85,7 @@ module Cucumber
           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"
+            warn 'DEPRECATED: cucumber-rails loves you, just not your version of Capybara. Please update Capybara to >= 0.4.0'
             self.node
           end
         end

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

@@ -3,17 +3,17 @@ module Cucumber
     module Capybara
       # This module defines methods for selecting dates and times
       module SelectDatesAndTimes
-        # Select a Rails date. Options has 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 has 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])
@@ -21,8 +21,8 @@ module Cucumber
           find(:xpath, ".//select[@id='#{base_dom_id}_4i']").select(time.hour.to_s.rjust(2, '0'))
           find(:xpath, ".//select[@id='#{base_dom_id}_5i']").select(time.min.to_s.rjust(2,  '0'))
         end
-      
-        # Select a Rails datetime. Options has 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,13 +1,11 @@
 module Cucumber
   module Rails
     module Database
-
       CUSTOM_STRATEGY_INTERFACE = %w{ before_js before_non_js }
 
-      class InvalidStrategy < ArgumentError;end
+      class InvalidStrategy < ArgumentError; end
 
       class << self
-
         attr_accessor :autorun_database_cleaner
 
         def javascript_strategy=(args)
@@ -41,24 +39,23 @@ module Cucumber
 
         def map
           {
-            :truncation => TruncationStrategy,
-            :shared_connection => SharedConnectionStrategy,
-            :transaction => SharedConnectionStrategy,
-            :deletion => DeletionStrategy
+            truncation: TruncationStrategy,
+            shared_connection: SharedConnectionStrategy,
+            transaction: SharedConnectionStrategy,
+            deletion: DeletionStrategy
           }
         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}" } * '  '} !")
+          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
+        def initialize(options = {})
+          @options = options
         end
 
         def before_js(strategy)