cucumber-rails 1.2.0 → 1.2.1

data/.travis.yml

@@ -11,4 +11,6 @@ before_script: sh -e /etc/init.d/xvfb start
 
 notifications:
   email:
-    - cukes-devs@googlegroups.com
+    - cukes-devs@googlegroups.com
+  irc:
+    - "irc.freenode.org#cucumber"

data/History.md

@@ -1,3 +1,10 @@
+## [v1.2.1](https://github.com/cucumber/cucumber-rails/compare/v1.2.0...v1.2.1)
+
+### New features
+
+* Allow ability to use deletion as a javascript database strategy ([#185](https://github.com/cucumber/cucumber-rails/pull/185) Thijs de Vries)
+* Support custom JS strategies ([#184](https://github.com/cucumber/cucumber-rails/pull/184) Michael Pabst)
+
 ## [v1.2.0](https://github.com/cucumber/cucumber-rails/compare/v1.1.1...v1.2.0)
 
 ### Removed features

data/README.md

@@ -49,7 +49,7 @@ If you know how to fix the bug yourself, make a second commit (after committing
 
 ### Setting up your environment
 
-I strongly recommend rvm and ruby 1.9.2. When you have that, cd into your cucumber-rails repository and:
+I strongly recommend rvm and ruby 1.9.3. When you have that, cd into your cucumber-rails repository and:
 
     gem install bundler
     bundle install

data/Rakefile

@@ -1,6 +1,7 @@
 # encoding: utf-8
 CUCUMBER_RAILS_VERSION = Gem::Specification.load(File.dirname(__FILE__) + '/cucumber-rails.gemspec').version.version
 require 'rubygems'
+require 'rdoc' # https://github.com/lsegal/yard/commit/b861dcc2d7f7e1fbbed7b552ac2e4f7caf68bafa
 require 'rake/clean'
 require 'bundler'
 Bundler::GemHelper.install_tasks

data/cucumber-rails.gemspec

@@ -3,38 +3,39 @@ $LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = 'cucumber-rails'
-  s.version     = '1.2.0'
+  s.version     = '1.2.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.1')
+  s.add_runtime_dependency('cucumber', '>= 1.1.3')
   s.add_runtime_dependency('nokogiri', '>= 1.5.0')
-  s.add_runtime_dependency('capybara', '>= 1.1.1')
-  s.add_development_dependency('rails', '>= 3.1.1')
-  s.add_development_dependency('rake', '>= 0.9.2')
+  s.add_runtime_dependency('capybara', '>= 1.1.2')
+  s.add_development_dependency('rails', '>= 3.1.3')
+  s.add_development_dependency('rake', '>= 0.9.2.2')
   s.add_development_dependency('bundler', '>= 1.0.21')
-  s.add_development_dependency('aruba', '>= 0.4.6')
-  s.add_development_dependency('sqlite3', '>= 1.3.4')
+  s.add_development_dependency('aruba', '>= 0.4.7')
+  s.add_development_dependency('sqlite3', '>= 1.3.5')
   s.add_development_dependency('rspec', '>= 2.7.0')
   s.add_development_dependency('rspec-rails', '>= 2.7.0')
   s.add_development_dependency('ammeter', '>= 0.2.1')
-  s.add_development_dependency('factory_girl', '>= 2.2.0')
-  s.add_development_dependency('database_cleaner', '>= 0.6.7')
-  s.add_development_dependency('mongoid', '>= 2.3.3')
-  s.add_development_dependency('bson_ext', '>= 1.4.0')
+  s.add_development_dependency('factory_girl', '>= 2.3.2')
+  s.add_development_dependency('database_cleaner', '>= 0.7.0')
+  s.add_development_dependency('mongoid', '>= 2.3.4')
+  s.add_development_dependency('bson_ext', '>= 1.5.1')
 
   # Various Stuff that Rails 3.1 puts inside apps.
   s.add_development_dependency('turn', '>= 0.8.3')
-  s.add_development_dependency('sass-rails', '>= 3.1.4')
+  s.add_development_dependency('sass-rails', '>= 3.1.5')
   s.add_development_dependency('coffee-rails', '>= 3.1.1')
-  s.add_development_dependency('uglifier', '>= 1.0.4')
-  s.add_development_dependency('jquery-rails', '>= 1.0.16')
+  s.add_development_dependency('uglifier', '>= 1.1.0')
+  s.add_development_dependency('jquery-rails', '>= 1.0.19')
 
   # For Documentation:
-  s.add_development_dependency('yard', '~> 0.7.3')
+  s.add_development_dependency('yard', '~> 0.7.4')
+  s.add_development_dependency('rdoc', '~> 3.11')
   s.add_development_dependency('rdiscount', '~> 1.6.8')
   s.add_development_dependency('bcat', '~> 0.6.2')
 

data/features/capybara_javascript_drivers.feature

@@ -18,7 +18,7 @@ Feature: Capybara Javascript Drivers
       end
       """
 
-  Scenario Outline: Use a particular driver
+  Scenario: Use a particular driver
     Given I write to "features/create_appointment.feature" with:
       """
       @javascript
@@ -32,17 +32,6 @@ Feature: Capybara Javascript Drivers
           And I should see "2009-02-20 15:10:00 UTC"
 
       """
-    And I append to "Gemfile" with:
-      """
-      <Gemfile extra>
-
-      """
-    And I append to "features/support/env.rb" with:
-      """
-      <env.rb extra>
-
-      """
-
     When I run `bundle exec rake db:migrate`
     And I run `bundle exec rake cucumber`
     Then it should pass with:
@@ -51,11 +40,7 @@ Feature: Capybara Javascript Drivers
       6 steps (6 passed)
       """
 
-    Examples:
-      | Gemfile extra                    | env.rb extra       |
-      | ''  | '' |
-
-  Scenario Outline: Mixed DB access
+  Scenario: Mixed DB access
     Given I write to "features/create_appointment.feature" with:
       """
       @javascript
@@ -76,16 +61,6 @@ Feature: Capybara Javascript Drivers
         visit appointment_path(@appointment)
       end
       """
-    And I append to "Gemfile" with:
-      """
-      <Gemfile extra>
-
-      """
-    And I append to "features/support/env.rb" with:
-      """
-      <env.rb extra>
-
-      """
 
     When I run `bundle exec rake db:migrate`
     And I run `bundle exec rake cucumber`
@@ -94,8 +69,3 @@ Feature: Capybara Javascript Drivers
       1 scenario (1 passed)
       3 steps (3 passed)
       """
-
-    Examples:
-      | Gemfile extra                    | env.rb extra       |
-      | ''  | '' |
-

data/features/choose_javascript_database_strategy.feature

@@ -1,9 +1,9 @@
 @announce
 Feature: Choose javascript database strategy
 
-  When running a scenario with the @javascript tag, Capybara will fire up a web server 
+  When running a scenario with the @javascript tag, Capybara will fire up a web server
   in the same process in a separate thread to your cukes. By default, this means ActiveRecord will give it a
-  separate database connection, which in turn means data you put into your database from 
+  separate database connection, which in turn means data you put into your database from
   Cucumber step definitions (e.g. using FactoryGirl) won't be visible to the web server
   until the database transaction is committed.
 
@@ -18,20 +18,23 @@ 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 
+  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.
 
+  The deletion strategy can be quicker for situations where truncation causes locks which
+  has been reported by some Oracle users.
+
   Background:
     Given I have created a new Rails 3 app and installed cucumber-rails
     And I have a "Widget" ActiveRecord model object
-    And I append to "features/env.rb" with:
+
+  Scenario: Set the strategy to truncation and run a javascript scenario.
+    Given I append to "features/env.rb" with:
       """
       Cucumber::Rails::Database.javascript_strategy = :truncation
       """
-
-  Scenario: Set the strategy to truncation and run a javascript scenario.
-    Given I write to "features/widgets.feature" with:
+    And I write to "features/widgets.feature" with:
       """
       @javascript
       Feature:
@@ -61,3 +64,39 @@ Feature: Choose javascript database strategy
        2 scenarios (2 passed)
        5 steps (5 passed)
        """
+
+  Scenario: Set the strategy to deletion and run a javascript scenario.
+    Given I append to "features/env.rb" with:
+      """
+      Cucumber::Rails::Database.javascript_strategy = :deletion
+      """
+    And I write to "features/widgets.feature" with:
+      """
+      @javascript
+      Feature:
+        Background:
+          Given I have created 2 widgets
+
+        Scenario:
+          When I create 3 widgets
+          Then I should have 5 widgets
+
+        Scenario:
+          Then I should have 2 widgets
+      """
+    And I write to "features/step_definitions/widget_steps.rb" with:
+      """
+      Given /created? (\d) widgets/ do |num|
+        num.to_i.times { Widget.create! }
+      end
+
+      Then /should have (\d) widgets/ do |num|
+        Widget.count.should == num.to_i
+      end
+      """
+    When I run the cukes
+    Then it should pass with:
+       """
+       2 scenarios (2 passed)
+       5 steps (5 passed)
+     """

data/lib/cucumber/rails/database.rb

@@ -1,11 +1,25 @@
 module Cucumber
   module Rails
     module Database
+
+      CUSTOM_STRATEGY_INTERFACE = %w{ before_js before_non_js }
+
+      class InvalidStrategy < ArgumentError;end
+
       class << self
 
         def javascript_strategy=(strategy)
-          strategy_type = map[strategy] || raise("The strategy '#{strategy}' is not understood. Please use one of #{map.keys.join(',')}")
+          strategy_type =
+            case strategy
+            when Symbol
+              map[strategy] || raise(InvalidStrategy, "The strategy '#{strategy}' is not understood. Please use one of #{map.keys.join(',')}")
+            when Class
+              strategy
+            end
+
           @strategy = strategy_type.new
+
+          validate_interface!
         end
 
         def before_js
@@ -22,10 +36,17 @@ module Cucumber
           {
             :truncation => TruncationStrategy,
             :shared_connection => SharedConnectionStrategy,
-            :transaction => 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}" } * '  '} !")
+          end
+        end
+
       end
 
       class SharedConnectionStrategy
@@ -48,10 +69,10 @@ module Cucumber
         end
       end
 
-      class TruncationStrategy
-        def before_js
+      class Strategy
+        def before_js(strategy)
           @original_strategy = DatabaseCleaner.connections.first.strategy # that feels like a nasty hack
-          DatabaseCleaner.strategy = :truncation
+          DatabaseCleaner.strategy = strategy
         end
 
         def before_non_js
@@ -61,7 +82,19 @@ module Cucumber
         end
       end
 
-      self.javascript_strategy = :transaction
+      class TruncationStrategy < Strategy
+        def before_js
+          super :truncation
+        end
+      end
+
+      class DeletionStrategy < Strategy
+        def before_js
+          super :deletion
+        end
+      end
+
+      Database.javascript_strategy = :truncation
     end
   end
 end

data/lib/generators/cucumber/install/USAGE

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

data/spec/cucumber/rails/database_spec.rb

@@ -0,0 +1,57 @@
+# -*- encoding: utf-8 -*-
+require 'cucumber/rails/database'
+
+describe Cucumber::Rails::Database do
+
+  let(:strategy) { stub(: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.javascript_strategy = :truncation
+
+    strategy.should_receive(:before_non_js).ordered
+    Cucumber::Rails::Database.before_non_js
+
+    strategy.should_receive(:before_js).ordered
+    Cucumber::Rails::Database.before_js
+  end
+
+  it 'raises an error if you use a non-understood strategy' do
+    expect { Cucumber::Rails::Database.javascript_strategy = :invalid }.to raise_error(Cucumber::Rails::Database::InvalidStrategy)
+  end
+
+  describe 'using a custom strategy' do
+    class ValidStrategy
+      def before_js
+        # Anything
+      end
+
+      def before_non_js
+        # Likewise
+      end
+    end
+
+    class InvalidStrategy
+    end
+
+    it 'raises an error if the strategy doens\'t support the protocol' do
+      expect { Cucumber::Rails::Database.javascript_strategy = InvalidStrategy }.to raise_error(ArgumentError)
+    end
+
+    it 'accepts a custom strategy with a valid interface' do
+      expect { Cucumber::Rails::Database.javascript_strategy = ValidStrategy }.not_to raise_error
+    end
+
+    it 'forwards events to a custom strategy' do
+      ValidStrategy.stub(:new => strategy)
+      Cucumber::Rails::Database.javascript_strategy = ValidStrategy
+
+      strategy.should_receive(:before_non_js).ordered
+      Cucumber::Rails::Database.before_non_js
+
+      strategy.should_receive(:before_js).ordered
+      Cucumber::Rails::Database.before_js
+    end
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cucumber-rails
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -11,22 +11,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-03 00:00:00.000000000 Z
+date: 2011-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &2156601340 !ruby/object:Gem::Requirement
+  requirement: &2153136380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: 1.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *2156601340
+  version_requirements: *2153136380
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &2156600860 !ruby/object:Gem::Requirement
+  requirement: &2153135740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,43 +34,43 @@ dependencies:
         version: 1.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *2156600860
+  version_requirements: *2153135740
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &2156600400 !ruby/object:Gem::Requirement
+  requirement: &2153135020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: 1.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *2156600400
+  version_requirements: *2153135020
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2156599940 !ruby/object:Gem::Requirement
+  requirement: &2153133620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.1.1
+        version: 3.1.3
   type: :development
   prerelease: false
-  version_requirements: *2156599940
+  version_requirements: *2153133620
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2156599480 !ruby/object:Gem::Requirement
+  requirement: &2153133160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: 0.9.2.2
   type: :development
   prerelease: false
-  version_requirements: *2156599480
+  version_requirements: *2153133160
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2156599020 !ruby/object:Gem::Requirement
+  requirement: &2153132680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -78,32 +78,32 @@ dependencies:
         version: 1.0.21
   type: :development
   prerelease: false
-  version_requirements: *2156599020
+  version_requirements: *2153132680
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &2156598560 !ruby/object:Gem::Requirement
+  requirement: &2153132000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.4.6
+        version: 0.4.7
   type: :development
   prerelease: false
-  version_requirements: *2156598560
+  version_requirements: *2153132000
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2156598100 !ruby/object:Gem::Requirement
+  requirement: &2153131280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.3.4
+        version: 1.3.5
   type: :development
   prerelease: false
-  version_requirements: *2156598100
+  version_requirements: *2153131280
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2156597640 !ruby/object:Gem::Requirement
+  requirement: &2153130560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -111,10 +111,10 @@ dependencies:
         version: 2.7.0
   type: :development
   prerelease: false
-  version_requirements: *2156597640
+  version_requirements: *2153130560
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &2156597180 !ruby/object:Gem::Requirement
+  requirement: &2153130060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -122,10 +122,10 @@ dependencies:
         version: 2.7.0
   type: :development
   prerelease: false
-  version_requirements: *2156597180
+  version_requirements: *2153130060
 - !ruby/object:Gem::Dependency
   name: ammeter
-  requirement: &2156596720 !ruby/object:Gem::Requirement
+  requirement: &2153129440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -133,54 +133,54 @@ dependencies:
         version: 0.2.1
   type: :development
   prerelease: false
-  version_requirements: *2156596720
+  version_requirements: *2153129440
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &2156596260 !ruby/object:Gem::Requirement
+  requirement: &2153128480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.3.2
   type: :development
   prerelease: false
-  version_requirements: *2156596260
+  version_requirements: *2153128480
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &2156595800 !ruby/object:Gem::Requirement
+  requirement: &2153117380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.6.7
+        version: 0.7.0
   type: :development
   prerelease: false
-  version_requirements: *2156595800
+  version_requirements: *2153117380
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &2156595340 !ruby/object:Gem::Requirement
+  requirement: &2153116500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.3.3
+        version: 2.3.4
   type: :development
   prerelease: false
-  version_requirements: *2156595340
+  version_requirements: *2153116500
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &2156594880 !ruby/object:Gem::Requirement
+  requirement: &2153115340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.5.1
   type: :development
   prerelease: false
-  version_requirements: *2156594880
+  version_requirements: *2153115340
 - !ruby/object:Gem::Dependency
   name: turn
-  requirement: &2156594420 !ruby/object:Gem::Requirement
+  requirement: &2153113540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -188,21 +188,21 @@ dependencies:
         version: 0.8.3
   type: :development
   prerelease: false
-  version_requirements: *2156594420
+  version_requirements: *2153113540
 - !ruby/object:Gem::Dependency
   name: sass-rails
-  requirement: &2156593960 !ruby/object:Gem::Requirement
+  requirement: &2153112700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.1.4
+        version: 3.1.5
   type: :development
   prerelease: false
-  version_requirements: *2156593960
+  version_requirements: *2153112700
 - !ruby/object:Gem::Dependency
   name: coffee-rails
-  requirement: &2156593500 !ruby/object:Gem::Requirement
+  requirement: &2153112120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -210,43 +210,54 @@ dependencies:
         version: 3.1.1
   type: :development
   prerelease: false
-  version_requirements: *2156593500
+  version_requirements: *2153112120
 - !ruby/object:Gem::Dependency
   name: uglifier
-  requirement: &2168752780 !ruby/object:Gem::Requirement
+  requirement: &2153111480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.4
+        version: 1.1.0
   type: :development
   prerelease: false
-  version_requirements: *2168752780
+  version_requirements: *2153111480
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &2168751800 !ruby/object:Gem::Requirement
+  requirement: &2153110640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.16
+        version: 1.0.19
   type: :development
   prerelease: false
-  version_requirements: *2168751800
+  version_requirements: *2153110640
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2168751000 !ruby/object:Gem::Requirement
+  requirement: &2153109940 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.7.4
+  type: :development
+  prerelease: false
+  version_requirements: *2153109940
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: &2153109400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.3
+        version: '3.11'
   type: :development
   prerelease: false
-  version_requirements: *2168751000
+  version_requirements: *2153109400
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &2168750020 !ruby/object:Gem::Requirement
+  requirement: &2153108940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -254,10 +265,10 @@ dependencies:
         version: 1.6.8
   type: :development
   prerelease: false
-  version_requirements: *2168750020
+  version_requirements: *2153108940
 - !ruby/object:Gem::Dependency
   name: bcat
-  requirement: &2168746380 !ruby/object:Gem::Requirement
+  requirement: &2153108360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -265,7 +276,7 @@ dependencies:
         version: 0.6.2
   type: :development
   prerelease: false
-  version_requirements: *2168746380
+  version_requirements: *2153108360
 description: Cucumber Generator and Runtime for Rails
 email: cukes@googlegroups.com
 executables: []
@@ -297,9 +308,7 @@ files:
 - features/choose_javascript_database_strategy.feature
 - features/database_cleaner.feature
 - features/emulate_javascript.feature
-- features/field_with_errors.feature
 - features/fixing_bundler_pre.feature
-- features/inspect_query_string.feature
 - features/install_cucumber_rails.feature
 - features/mongoid.feature
 - features/multiple_databases.feature
@@ -338,6 +347,7 @@ files:
 - lib/generators/cucumber/install/templates/support/rails.rb.erb
 - lib/generators/cucumber/install/templates/support/rails_spork.rb.erb
 - lib/generators/cucumber/install/templates/tasks/cucumber.rake.erb
+- spec/cucumber/rails/database_spec.rb
 - spec/generators/cucumber/install/install_generator_spec.rb
 - spec/spec_helper.rb
 homepage: http://cukes.info
@@ -363,16 +373,14 @@ rubyforge_project:
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: cucumber-rails-1.2.0
+summary: cucumber-rails-1.2.1
 test_files:
 - features/allow_rescue.feature
 - features/capybara_javascript_drivers.feature
 - features/choose_javascript_database_strategy.feature
 - features/database_cleaner.feature
 - features/emulate_javascript.feature
-- features/field_with_errors.feature
 - features/fixing_bundler_pre.feature
-- features/inspect_query_string.feature
 - features/install_cucumber_rails.feature
 - features/mongoid.feature
 - features/multiple_databases.feature
@@ -386,6 +394,7 @@ test_files:
 - features/support/fixtures/bundler-1.0.21.gem
 - features/support/fixtures/bundler-1.1.rc.gem
 - features/support/legacy_web_steps_support.rb
+- spec/cucumber/rails/database_spec.rb
 - spec/generators/cucumber/install/install_generator_spec.rb
 - spec/spec_helper.rb
 has_rdoc: 

data/features/field_with_errors.feature

@@ -1,70 +0,0 @@
-Feature: Detecting a field has errors on it
-
-  Scenario: A form with some fields with errors
-    Given I have created a new Rails 3 app and installed cucumber-rails
-    And I successfully run `rails generate scaffold enemy name:string nickname:string`
-    And I write to "app/models/enemy.rb" with:
-      """
-      class Enemy < ActiveRecord::Base
-        validates_presence_of :name
-      end
-      """
-    And I write to "features/f.feature" with:
-      """
-      Feature: Enemy form
-        Scenario: Making an enemy
-          Given I am on the new enemy page
-          And I press "Create Enemy"
-          Then the "Name" field should have the error "can't be blank"
-          And the "Nickname" field should have no error
-      """
-    When I run `bundle exec rake db:migrate`
-    And I run `bundle exec rake cucumber`
-    Then it should pass with:
-       """
-       1 scenario (1 passed)
-       4 steps (4 passed)
-       """
-
-  Scenario: A formtastic form with some fields with errors
-  Given I have created a new Rails 3 app and installed cucumber-rails
-    And I append to "Gemfile" with:
-      """
-      gem "formtastic"
-      """
-    And I successfully run `bundle`
-    And I successfully run `rails generate scaffold enemy name:string nickname:string`
-    And I write to "app/models/enemy.rb" with:
-      """
-      class Enemy < ActiveRecord::Base
-        validates_presence_of :name
-      end
-      """
-    And I write to "features/f.feature" with:
-      """
-      Feature: Enemy form
-        Scenario: Making an enemy
-          Given I am on the new enemy page
-          And I press "Create Enemy"
-          Then the "Name" field should have the error "can't be blank"
-          And the "Nickname" field should have no error
-      """
-    And I write to "app/views/enemies/new.html.erb" with:
-    """
-    <%= semantic_form_for(@enemy) do |form| %>
-      <%= form.inputs do %>
-        <%= form.input :name %>
-        <%= form.input :nickname %>
-      <% end %>
-      <%= form.buttons do %>
-        <%= form.commit_button %>
-      <% end %>
-    <% end %>
-    """
-    When I run `bundle exec rake db:migrate`
-    And I run `bundle exec rake cucumber`
-    Then it should pass with:
-       """
-       1 scenario (1 passed)
-       4 steps (4 passed)
-       """

data/features/inspect_query_string.feature

@@ -1,35 +0,0 @@
-Feature: Inspect query string
-
-  Scenario: Inspect query string
-    Given I have created a new Rails 3 app and installed cucumber-rails
-    And I successfully run `rails generate scaffold cuke name:string`
-    And I overwrite "app/controllers/cukes_controller.rb" with:
-      """
-      class CukesController < ApplicationController
-        def index
-          redirect_to cuke_path(10, {:name => 'cucumber', :what => 'vegetable'})
-        end
-        
-        def show
-          render :text => "Cuke #{params[:id]}"
-        end
-      end
-      """
-    And I write to "features/tests.feature" with:
-      """
-      Feature: Tests
-        Scenario: Tests
-          When I go to the cukes page
-          Then I should have the following query string: 
-            | name | cucumber  |
-            | what | vegetable |
-          And I should see "Cuke 10"
-      """
-    And I run `bundle exec rake db:migrate`
-    And I run `bundle exec rake cucumber`
-    Then it should pass with:
-       """
-       1 scenario (1 passed)
-       3 steps (3 passed)
-       """
-