cucumber-rails 1.4.0 → 1.4.1

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

@@ -8,14 +8,14 @@ if defined?(ActiveRecord::Base)
   end
 
   Before('@javascript') do
-    Cucumber::Rails::Database.before_js
+    Cucumber::Rails::Database.before_js if Cucumber::Rails::Database.autorun_database_cleaner
   end
 
   Before('~@javascript') do
-    Cucumber::Rails::Database.before_non_js
+    Cucumber::Rails::Database.before_non_js if Cucumber::Rails::Database.autorun_database_cleaner
   end
 
   After do
-    Cucumber::Rails::Database.after
+    Cucumber::Rails::Database.after if Cucumber::Rails::Database.autorun_database_cleaner
   end
 end

data/lib/cucumber/rails/rspec.rb

@@ -3,7 +3,7 @@ require 'cucumber/rails/world'
 begin
   require 'rspec/rails/matchers'
 
-  [Cucumber::Rails::World, ActionController::Integration::Session].each do |klass|
+  [Cucumber::Rails::World, ActionDispatch::Integration::Session].each do |klass|
     klass.class_eval do
       include RSpec::Matchers
     end
@@ -12,7 +12,7 @@ rescue LoadError => try_rspec_1
   require 'spec/expectations'
   require 'spec/rails'
 
-  [Cucumber::Rails::World, ActionController::Integration::Session].each do |klass|
+  [Cucumber::Rails::World, ActionDispatch::Integration::Session].each do |klass|
     klass.class_eval do
       include Spec::Matchers
       include Spec::Rails::Matchers if defined?(Spec::Rails::Matchers)

data/lib/cucumber/rails/world.rb

@@ -8,13 +8,13 @@ module Cucumber #:nodoc:
   module Rails #:nodoc:
     class World < ActionDispatch::IntegrationTest #:nodoc:
       include Rack::Test::Methods
-      include ActiveSupport::Testing::SetupAndTeardown if ActiveSupport::Testing.const_defined?("SetupAndTeardown")
+      include ActiveSupport::Testing::SetupAndTeardown if ActiveSupport::Testing.const_defined?('SetupAndTeardown')
 
       def initialize #:nodoc:
         @_result = Test::Unit::TestResult.new if defined?(Test::Unit::TestResult)
       end
 
-      if !defined?(ActiveRecord::Base)
+      unless defined?(ActiveRecord::Base)
         def self.fixture_table_names; []; end # Workaround for projects that don't use ActiveRecord
       end
     end

data/lib/generators/cucumber/install/USAGE

@@ -1,9 +1,9 @@
 Description:
     Sets up Cucumber in your Rails project. After running this generator you will
     get a new rake task called cucumber.
-    
+
     This also generates the necessary files in the features directory.
-    
+
 Examples:
     `rails generate cucumber:install`
 

data/lib/generators/cucumber/install/install_generator.rb

@@ -2,12 +2,12 @@ require 'rbconfig'
 
 module Cucumber
   class InstallGenerator < ::Rails::Generators::Base
-    source_root File.expand_path("../templates", __FILE__)
+    source_root File.expand_path('../templates', __FILE__)
 
     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'
@@ -20,6 +20,7 @@ module Cucumber
 
     def create_step_definitions
       empty_directory 'features/step_definitions'
+      create_file 'features/step_definitions/.gitkeep'
     end
 
     def create_feature_support
@@ -41,9 +42,9 @@ module Cucumber
       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"
-        
+
         # Since gsub_file doesn't ask the user, just inform user that the file was overwritten.
-        puts "       force  config/database.yml"
+        puts '       force  config/database.yml'
       end
     end
 
@@ -53,14 +54,13 @@ module Cucumber
       options[:spork]
     end
 
-    def embed_file(source, indent='')
+    def embed_file(source, indent = '')
       IO.read(File.join(self.class.source_root, source)).gsub(/^/, indent)
     end
 
-    def embed_template(source, indent='')
+    def embed_template(source, indent = '')
       template = File.join(self.class.source_root, source)
       ERB.new(IO.read(template), nil, '-').result(binding).gsub(/^/, indent)
     end
-
   end
-end
+end

data/lib/generators/cucumber/install/templates/support/_rails_each_run.rb.erb

@@ -1,6 +1,6 @@
 # By default, any exception happening in your Rails application will bubble up
-# to Cucumber so that your scenario will fail. This is a different from how 
-# your application behaves in the production environment, where an error page will 
+# to Cucumber so that your scenario will fail. This is a different from how
+# your application behaves in the production environment, where an error page will
 # be rendered instead.
 #
 # Sometimes we want to override this default behaviour and allow Rails to rescue

data/lib/generators/cucumber/install/templates/support/rails_spork.rb.erb

@@ -1,13 +1,13 @@
 <%= embed_file('support/edit_warning.txt') %>
 require 'rubygems'
 require 'spork'
- 
+
 Spork.prefork do
 <%= embed_template('support/_rails_prefork.rb.erb', '  ') %>
 
 <%= embed_file("support/capybara.rb", '  ') %>
 end
- 
+
 Spork.each_run do
 <%= embed_template('support/_rails_each_run.rb.erb', '  ') %>
 end

data/spec/cucumber/rails/database_spec.rb

@@ -3,10 +3,10 @@ require 'cucumber/rails/database'
 
 describe Cucumber::Rails::Database do
 
-  let(:strategy) { stub(:before_js => nil, :before_non_js => nil) }
+  let(:strategy) { double(before_js: nil, before_non_js: nil) }
 
   it 'forwards events to the selected strategy' do
-    Cucumber::Rails::Database::TruncationStrategy.stub(:new => strategy)
+    Cucumber::Rails::Database::TruncationStrategy.stub(new: strategy)
     Cucumber::Rails::Database.javascript_strategy = :truncation
 
     strategy.should_receive(:before_non_js).ordered
@@ -43,7 +43,7 @@ describe Cucumber::Rails::Database do
     end
 
     it 'forwards events to a custom strategy' do
-      ValidStrategy.stub(:new => strategy)
+      ValidStrategy.stub(new: strategy)
       Cucumber::Rails::Database.javascript_strategy = ValidStrategy
 
       strategy.should_receive(:before_non_js).ordered

data/spec/generators/cucumber/install/install_generator_spec.rb

@@ -5,7 +5,7 @@ require 'generators/cucumber/install/install_generator'
 
 describe Cucumber::InstallGenerator do
   # Tell the generator where to put its output (what it thinks of as Rails.root)
-  destination File.expand_path("../../../../../tmp", __FILE__)
+  destination File.expand_path('../../../../../tmp', __FILE__)
 
   before { prepare_destination }
 
@@ -15,7 +15,7 @@ describe Cucumber::InstallGenerator do
     describe 'config/cucumber.yml' do
       subject { file('config/cucumber.yml') }
       it { should exist }
-      it { should contain "default: <%= std_opts %> features" }
+      it { should contain 'default: <%= std_opts %> features' }
     end
 
     describe 'features/step_definitions folder' do
@@ -26,21 +26,21 @@ describe Cucumber::InstallGenerator do
     describe 'features/support/env.rb' do
       subject { file('features/support/env.rb') }
       it { should exist }
-      it { should contain "# IMPORTANT: This file is generated by cucumber-rails - edit at your own peril." }
+      it { should contain '# IMPORTANT: This file is generated by cucumber-rails - edit at your own peril.' }
       it { should contain "require 'cucumber/rails'" }
     end
 
     describe 'lib/tasks/cucumber.rake' do
       subject { file('lib/tasks/cucumber.rake') }
       it { should exist }
-      it { should contain "# IMPORTANT: This file is generated by cucumber-rails - edit at your own peril." }
+      it { should contain '# IMPORTANT: This file is generated by cucumber-rails - edit at your own peril.' }
       it { should contain "task :cucumber => 'cucumber:ok'" }
     end
 
     describe 'script/cucumber' do
       subject { file('script/cucumber') }
       it { should exist }
-      it { should contain "load Cucumber::BINARY" }
+      it { should contain 'load Cucumber::BINARY' }
     end
 
   end

data/spec/spec_helper.rb

@@ -1,4 +1,5 @@
 require 'rubygems'
 require 'rspec/autorun'
 
+require 'rails/version'
 require 'ammeter/init'

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cucumber-rails
 version: !ruby/object:Gem::Version
-  version: 1.4.0
-  prerelease: 
+  version: 1.4.1
 platform: ruby
 authors:
 - Aslak Hellesøy
@@ -11,184 +10,290 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-23 00:00:00.000000000 Z
+date: 2014-05-11 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: capybara
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.1.2
+    - - <
+      - !ruby/object:Gem::Version
+        version: '3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.1.2
+    - - <
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &22482920 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.8
+    - - <
+      - !ruby/object:Gem::Version
+        version: '2'
   type: :runtime
   prerelease: false
-  version_requirements: *22482920
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.3.8
+    - - <
+      - !ruby/object:Gem::Version
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &22481680 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: '1.5'
   type: :runtime
   prerelease: false
-  version_requirements: *22481680
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.5'
 - !ruby/object:Gem::Dependency
-  name: capybara
-  requirement: &22498700 !ruby/object:Gem::Requirement
-    none: false
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: '3'
+    - - <
+      - !ruby/object:Gem::Version
+        version: '5'
   type: :runtime
   prerelease: false
-  version_requirements: *22498700
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '3'
+    - - <
+      - !ruby/object:Gem::Version
+        version: '5'
 - !ruby/object:Gem::Dependency
-  name: rails
-  requirement: &22498060 !ruby/object:Gem::Requirement
-    none: false
+  name: mime-types
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '1.16'
   type: :runtime
   prerelease: false
-  version_requirements: *22498060
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.16'
 - !ruby/object:Gem::Dependency
-  name: rake
-  requirement: &22497020 !ruby/object:Gem::Requirement
-    none: false
+  name: ammeter
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.9.2.2
+        version: 0.2.9
+    - - <
+      - !ruby/object:Gem::Version
+        version: '1'
   type: :development
   prerelease: false
-  version_requirements: *22497020
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.2.9
+    - - <
+      - !ruby/object:Gem::Version
+        version: '1'
 - !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: &22495880 !ruby/object:Gem::Requirement
-    none: false
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.3.5
+        version: 0.5.1
   type: :development
   prerelease: false
-  version_requirements: *22495880
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.5.1
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &22495340 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.4.11
   type: :development
   prerelease: false
-  version_requirements: *22495340
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.4.11
 - !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: &22494680 !ruby/object:Gem::Requirement
-    none: false
+  name: builder
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: 2.1.2
+    - - <
+      - !ruby/object:Gem::Version
+        version: '3.2'
   type: :development
   prerelease: false
-  version_requirements: *22494680
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 2.1.2
+    - - <
+      - !ruby/object:Gem::Version
+        version: '3.2'
 - !ruby/object:Gem::Dependency
-  name: ammeter
-  requirement: &22494040 !ruby/object:Gem::Requirement
-    none: false
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.2.9
+        version: 1.3.5
   type: :development
   prerelease: false
-  version_requirements: *22494040
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.3.5
 - !ruby/object:Gem::Dependency
-  name: factory_girl
-  requirement: &22493520 !ruby/object:Gem::Requirement
-    none: false
+  name: database_cleaner
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 0.7.2
   type: :development
   prerelease: false
-  version_requirements: *22493520
-- !ruby/object:Gem::Dependency
-  name: database_cleaner
-  requirement: &22492780 !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.7.2
+- !ruby/object:Gem::Dependency
+  name: factory_girl
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '3.2'
   type: :development
   prerelease: false
-  version_requirements: *22492780
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '3.2'
 - !ruby/object:Gem::Dependency
-  name: appraisal
-  requirement: &22492140 !ruby/object:Gem::Requirement
-    none: false
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 0.9.2.2
   type: :development
   prerelease: false
-  version_requirements: *22492140
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.2.2
 - !ruby/object:Gem::Dependency
-  name: yard
-  requirement: &22491180 !ruby/object:Gem::Requirement
-    none: false
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.8.5.2
+        version: '2.2'
   type: :development
   prerelease: false
-  version_requirements: *22491180
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '2.2'
 - !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: &22508220 !ruby/object:Gem::Requirement
-    none: false
+  name: bcat
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 3.12.2
+        version: 0.6.2
   type: :development
   prerelease: false
-  version_requirements: *22508220
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.6.2
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &22507480 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.0.7
   type: :development
   prerelease: false
-  version_requirements: *22507480
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 2.0.7
 - !ruby/object:Gem::Dependency
-  name: bcat
-  requirement: &22506340 !ruby/object:Gem::Requirement
-    none: false
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.6.2
+        version: '3.4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '3.4'
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.8.7
   type: :development
   prerelease: false
-  version_requirements: *22506340
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.8.7
 description: Cucumber Generator and Runtime for Rails
 email: cukes@googlegroups.com
 executables: []
@@ -230,7 +335,6 @@ files:
 - features/rerun_profile.feature
 - features/rest_api.feature
 - features/step_definitions/cucumber_rails_steps.rb
-- features/step_definitions/mongo_steps.rb
 - features/support/bundler_pre_support.rb
 - features/support/env.rb
 - features/support/fixtures/bundler-1.0.21.gem
@@ -241,6 +345,7 @@ files:
 - gemfiles/rails_3_1.gemfile
 - gemfiles/rails_3_2.gemfile
 - gemfiles/rails_4_0.gemfile
+- gemfiles/rails_4_1.gemfile
 - lib/cucumber/rails.rb
 - lib/cucumber/rails/action_controller.rb
 - lib/cucumber/rails/application.rb
@@ -270,34 +375,28 @@ files:
 - spec/generators/cucumber/install/install_generator_spec.rb
 - spec/spec_helper.rb
 homepage: http://cukes.info
-licenses: []
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1668878615738535966
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1668878615738535966
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 2.1.11
 signing_key: 
-specification_version: 3
-summary: cucumber-rails-1.4.0
+specification_version: 4
+summary: cucumber-rails-1.4.1
 test_files: []
 has_rdoc: