cucumber-rails 1.3.0 → 1.3.1

data/config/cucumber.yml

@@ -1 +1,15 @@
-default: --tags ~@broken
+<%
+rerun_file = '.cucumber.rerun'
+failing_scenarios = IO.read(rerun_file) rescue ''
+path = if failing_scenarios.empty?
+  'features'
+else
+  puts "Running failed scenarios"
+  failing_scenarios
+end
+opts = [
+  "--format #{path == 'features' ? 'progress' : 'pretty'}",
+  "--format rerun -o #{rerun_file}"
+].join(' ')
+%>
+default: <%= path %> <%= opts %> --tags ~@broken

data/cucumber-rails.gemspec

@@ -3,40 +3,32 @@ $LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = 'cucumber-rails'
-  s.version     = '1.3.0'
+  s.version     = '1.3.1'
   s.authors     = ["Aslak Hellesøy", "Dennis Blöte", "Rob Holland"]
   s.description = "Cucumber Generator and Runtime for Rails"
   s.summary     = "#{s.name}-#{s.version}"
   s.email       = 'cukes@googlegroups.com'
   s.homepage    = "http://cukes.info"
 
-  s.add_runtime_dependency('cucumber', '>= 1.1.8')
+  s.add_runtime_dependency('cucumber', '>= 1.2.0')
   s.add_runtime_dependency('nokogiri', '>= 1.5.0')
   s.add_runtime_dependency('capybara', '>= 1.1.2')
-  s.add_development_dependency('rails', '>= 3.2.1')
+  s.add_runtime_dependency('rails', '~> 3.0')
+
+  # Main development dependencies
   s.add_development_dependency('rake', '>= 0.9.2.2')
-  s.add_development_dependency('bundler', '>= 1.0.22')
+  s.add_development_dependency('bundler', '>= 1.1.0')
   s.add_development_dependency('aruba', '>= 0.4.11')
-  s.add_development_dependency('sqlite3', '>= 1.3.5')
-  s.add_development_dependency('rspec', '~> 2.7.0') # Bump when cucumber bumps it
-  s.add_development_dependency('rspec-rails', '~> 2.7.0')
-  s.add_development_dependency('ammeter', '>= 0.2.2')
-  s.add_development_dependency('factory_girl', '>= 2.6.0')
-  s.add_development_dependency('database_cleaner', '>= 0.7.1')
-  s.add_development_dependency('mongoid', '>= 2.4.4')
-  s.add_development_dependency('bson_ext', '>= 1.5.2')
-
-  # Various Stuff that Rails 3.1 puts inside apps.
-  s.add_development_dependency('turn', '>= 0.9.3')
-  s.add_development_dependency('sass-rails', '>= 3.2.4')
-  s.add_development_dependency('coffee-rails', '>= 3.2.2')
-  s.add_development_dependency('uglifier', '>= 1.2.3')
-  s.add_development_dependency('jquery-rails', '>= 2.0.0')
+  s.add_development_dependency('rspec', '~> 2.10.0')
+  s.add_development_dependency('ammeter', '>= 0.2.5')
+  s.add_development_dependency('factory_girl', '>= 3.2.0')
+  s.add_development_dependency('database_cleaner', '>= 0.7.2')
+  s.add_development_dependency('appraisal', '~> 0.5.1')
 
   # For Documentation:
-  s.add_development_dependency('yard', '~> 0.7.5')
-  s.add_development_dependency('rdoc', '~> 3.12')
-  s.add_development_dependency('rdiscount', '~> 1.6.8')
+  s.add_development_dependency('yard', '~> 0.8.5.2')
+  s.add_development_dependency('rdoc', '~> 3.12.2')
+  s.add_development_dependency('rdiscount', '~> 2.0.7')
   s.add_development_dependency('bcat', '~> 0.6.2')
 
   s.rubygems_version = ">= 1.6.1"

data/dev_tasks/yard.rake

@@ -1,17 +1,35 @@
 require 'yard'
 require 'yard/rake/yardoc_task'
 
-YARD::Templates::Engine.register_template_path(File.expand_path(File.join(File.dirname(__FILE__), 'yard')))
-YARD::Rake::YardocTask.new(:yard) do |t|
-  t.options = %w{--no-private --title Cucumber-Rails}
-  t.files = %w{lib - README.md History.md LICENSE}
-end
+SITE_DIR = File.expand_path(File.dirname(__FILE__) + '/../cucumber.github.com')
+API_DIR = File.join(SITE_DIR, 'api', 'cucumber-rails', 'ruby', 'yardoc')
 
-desc "Push yardoc to http://cukes.info/cucumber-rails/api/#{CUCUMBER_RAILS_VERSION}"
-task :push_yard => :yard do
-  sh("tar czf tmp/api-#{CUCUMBER_RAILS_VERSION}.tgz -C doc .")
-  sh("scp tmp/api-#{CUCUMBER_RAILS_VERSION}.tgz cukes.info:/var/www/cucumber-rails/api")
-  sh("ssh cukes.info 'cd /var/www/cucumber-rails/api && rm -rf #{CUCUMBER_RAILS_VERSION} && mkdir #{CUCUMBER_RAILS_VERSION} && tar xzf api-#{CUCUMBER_RAILS_VERSION}.tgz -C #{CUCUMBER_RAILS_VERSION} && rm -f latest && ln -s #{CUCUMBER_RAILS_VERSION} latest'")
-end
+namespace :api do
+  file :dir do
+    unless File.directory?(SITE_DIR)
+      raise "You need to git clone git@github.com:cucumber/cucumber.github.com.git #{SITE_DIR}"
+    end
+    sh('git pull origin master')
+    mkdir_p API_DIR
+  end
+
+  template_path = File.expand_path(File.join(File.dirname(__FILE__), 'yard'))
+  YARD::Templates::Engine.register_template_path(template_path)
+  YARD::Rake::YardocTask.new(:yard) do |yard|
+    dir = API_DIR
+    mkdir_p dir
+    yard.options = ["--out", dir]
+  end
+  task :yard => :dir
 
-task :release => :push_yard
+  task :release do
+    Dir.chdir(SITE_DIR) do
+      sh('git add .')
+      sh("git commit -m 'Update API docs for cucumber-rails v#{cucumber-rails::VERSION}'")
+      sh('git push origin master')
+    end
+  end
+
+  desc "Generate YARD docs for Cucumber-Rails' API"
+  task :doc => [:yard, :release]
+end

data/features/allow_rescue.feature

@@ -18,7 +18,7 @@ Feature: Allow Cucumber to rescue exceptions
       """
 
   Scenario: Allow rescue
-    And I write to "features/posts.feature" with:
+    Given I write to "features/posts.feature" with:
       """
       Feature: posts
         @allow-rescue

data/features/choose_javascript_database_strategy.feature

@@ -1,4 +1,3 @@
-@announce
 Feature: Choose javascript database strategy
 
   When running a scenario with the @javascript tag, Capybara will fire up a web server
@@ -18,9 +17,8 @@ Feature: Choose javascript database strategy
   your database, but you run the risk of the two threads stomping on one another as they
   talk to the database.
 
-  Right now, the default behavior which works for 80% of cucumber-rails users is to use
-  the shared connection patch, but you can override this by telling cucumber-rails which
-  strategy to use for javascript scenarios.
+  Right now, the default behavior is to use truncation, but you can override this by telling
+  cucumber-rails which strategy to use for javascript scenarios.
 
   The deletion strategy can be quicker for situations where truncation causes locks which
   has been reported by some Oracle users.
@@ -32,21 +30,29 @@ Feature: Choose javascript database strategy
   Scenario: Set the strategy to truncation and run a javascript scenario.
     Given I append to "features/env.rb" with:
       """
+      DatabaseCleaner.strategy = :transaction
       Cucumber::Rails::Database.javascript_strategy = :truncation
       """
     And I write to "features/widgets.feature" with:
       """
-      @javascript
       Feature:
         Background:
           Given I have created 2 widgets
 
+        @javascript
         Scenario:
+          Then the DatabaseCleaner strategy should be truncation
           When I create 3 widgets
           Then I should have 5 widgets
 
+        @javascript
         Scenario:
-          Then I should have 2 widgets
+          Then the DatabaseCleaner strategy should be truncation
+          And I should have 2 widgets
+
+        Scenario:
+          Then the DatabaseCleaner strategy should be transaction
+          And I should have 2 widgets
       """
     And I write to "features/step_definitions/widget_steps.rb" with:
       """
@@ -57,12 +63,16 @@ Feature: Choose javascript database strategy
       Then /should have (\d) widgets/ do |num|
         Widget.count.should == num.to_i
       end
+
+      Then /^the DatabaseCleaner strategy should be (\w+)$/ do |strategy_name|
+        DatabaseCleaner.connections.first.strategy.to_s.should =~ /#{strategy_name}/i
+      end
       """
     When I run the cukes
     Then it should pass with:
        """
-       2 scenarios (2 passed)
-       5 steps (5 passed)
+       3 scenarios (3 passed)
+       10 steps (10 passed)
        """
 
   Scenario: Set the strategy to deletion and run a javascript scenario.
@@ -103,7 +113,7 @@ Feature: Choose javascript database strategy
   Scenario: Set the strategy to truncation with an except option and run a javascript scenario.
     Given I append to "features/env.rb" with:
       """
-      Cucumber::Rails::Database.javascript_strategy = :truncation, {:except=>%w[widgets]} 
+      Cucumber::Rails::Database.javascript_strategy = :truncation, {:except=>%w[widgets]}
       """
     And I write to "features/widgets.feature" with:
       """

data/features/disable_automatic_database_cleaning.feature

@@ -0,0 +1,55 @@
+Feature: Disable automatic database cleaning
+
+  By default, a set of Before/After hooks are installed to
+  invoke database_cleaner on every scenario except those tagged
+  "@no-database-cleaner". Sometimes when a user is switching between
+  cleaning strategies, this can initiate an undesired database
+  transaction.
+
+  To avoid the need for users making frequent strategy switches to apply
+  this tag, a configuration option is provided so that the user can
+  control the invocation of database_cleaner explicitly.
+
+  Scenario: Disabling automatic cleaning
+    Given I have created a new Rails 3 app and installed cucumber-rails
+    And I append to "features/env.rb" with:
+      """
+      Cucumber::Rails::Database.autorun_database_cleaner = false
+      """
+    And I write to "features/widgets.feature" with:
+      """
+      Feature: Create widgets
+        Scenario: Create 3 widgets
+          When I create 3 widgets
+          Then I should have 3 widgets
+
+        Scenario: Create 5 widgets
+          When I create 5 widgets
+          Then I should have 8 widgets
+      """
+    And I successfully run `rails generate model widget name:string`
+    And I write to "features/step_definitions/widget_steps.rb" with:
+      """
+      Given /^I have (\d+) widgets$/ do |n|
+        n.to_i.times do |i|
+          Widget.create! :name => "Widget #{Widget.count + i}"
+        end
+      end
+
+      When /^I create (\d+) widgets$/ do |n|
+        n.to_i.times do |i|
+          Widget.create! :name => "Widget #{Widget.count + i}"
+        end
+      end
+
+      Then /^I should have (\d+) widgets$/ do |n|
+        Widget.count.should == n.to_i
+      end
+      """
+    And I run `bundle exec rake db:migrate`
+    And I run `bundle exec rake cucumber`
+    Then it should pass with:
+       """
+       2 scenarios (2 passed)
+       4 steps (4 passed)
+       """

data/features/fixing_bundler_pre.feature

@@ -20,5 +20,6 @@ Feature: Fixing Bundler Pre
       1 step (1 passed)
       """
     And the output should contain "WARNING:"
+    And the output should contain ":require => false"
 
 

data/features/mongoid.feature

@@ -1,5 +1,8 @@
 Feature: Mongoid
 
+  Background:
+    Given mongodb is running on my machine
+
   Scenario: Keep Mongoid happy
     Given I successfully run `rails new cuke-app -O`
     And I cd to "cuke-app"

data/features/multiple_databases.feature

@@ -16,6 +16,8 @@ Feature: Multiple Databases
       """
       class Bear < ActiveRecord::Base
         establish_connection "ursidae"
+
+        attr_accessible :name
       end
       """
     And a directory named "db/migrate"

data/features/no_database.feature

@@ -1,4 +1,3 @@
-@announce
 Feature: No Database
   Allow Cucumber to work with a Rails app without a database
 

data/features/step_definitions/mongo_steps.rb

@@ -0,0 +1,3 @@
+Given /^mongodb is running on my machine$/ do
+  run_simple('echo "exit" | mongo')
+end

data/gemfiles/capybara_1_1.gemfile

@@ -0,0 +1,17 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "capybara", "~> 1.1.2"
+gem "rails", "~> 3.2.12"
+gem "turn"
+gem "rspec-rails"
+gem "sass-rails"
+gem "coffee-rails"
+gem "uglifier"
+gem "jquery-rails"
+gem "sqlite3"
+gem "bson_ext"
+gem "mongoid"
+
+gemspec :path=>"../"

data/gemfiles/rails_3_0.gemfile

@@ -0,0 +1,15 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 3.0.20"
+gem "capybara", "~> 2.0.2"
+gem "turn"
+gem "rspec-rails"
+gem "jquery-rails"
+gem "uglifier"
+gem "sqlite3"
+gem "bson_ext"
+gem "mongoid"
+
+gemspec :path=>"../"

data/gemfiles/rails_3_1.gemfile

@@ -0,0 +1,17 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 3.1.11"
+gem "capybara", "~> 2.0.2"
+gem "turn"
+gem "rspec-rails"
+gem "sass-rails"
+gem "coffee-rails"
+gem "uglifier"
+gem "jquery-rails"
+gem "sqlite3"
+gem "bson_ext"
+gem "mongoid"
+
+gemspec :path=>"../"

data/gemfiles/rails_3_2.gemfile

@@ -0,0 +1,17 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 3.2.12"
+gem "capybara", "~> 2.0.2"
+gem "turn"
+gem "rspec-rails"
+gem "sass-rails"
+gem "coffee-rails"
+gem "uglifier"
+gem "jquery-rails"
+gem "sqlite3"
+gem "bson_ext"
+gem "mongoid"
+
+gemspec :path=>"../"

data/lib/cucumber/rails.rb

@@ -24,6 +24,7 @@ if env_caller
   require 'cucumber/rails/database'
 
 else
-  warn "WARNING: Cucumber-rails required outside of env.rb.  The rest of loading is being defered until env.rb is called.
-  To avoid this warning, move 'gem cucumber-rails' under only group :test in your Gemfile"
-end
+  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/database.rb

@@ -8,6 +8,8 @@ module Cucumber
 
       class << self
 
+        attr_accessor :autorun_database_cleaner
+
         def javascript_strategy=(args)
           strategy, *strategy_opts = args
           strategy_type =
@@ -17,7 +19,7 @@ module Cucumber
             when Class
               strategy
             end
-            
+
           @strategy =  strategy_type.new(*strategy_opts)
 
           validate_interface!
@@ -31,6 +33,10 @@ module Cucumber
           @strategy.before_non_js
         end
 
+        def after
+          @strategy.after
+        end
+
       private
 
         def map
@@ -50,37 +56,21 @@ module Cucumber
 
       end
 
-      class SharedConnectionStrategy
-        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
-
       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
@@ -99,7 +89,28 @@ module Cucumber
         end
       end
 
+      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
+
       Database.javascript_strategy = :truncation
+      Database.autorun_database_cleaner = true
     end
   end
 end