cucumber-rails 1.1.1 → 1.2.0

data/.gitignore

@@ -6,3 +6,4 @@ coverage
 .rvmrc
 .yardoc/
 .rvmrc
+Gemfile.lock

data/History.md

@@ -1,3 +1,11 @@
+## [v1.2.0](https://github.com/cucumber/cucumber-rails/compare/v1.1.1...v1.2.0)
+
+### Removed features
+* The (deprecated) tableish method has been removed. See https://gist.github.com/1299371 for an alternative. (Aslak Hellesøy)
+
+### Bugfixes
+* Non-threadsafe database connections shared between threads ([#166](https://github.com/cucumber/cucumber-rails/issues/166) Matt Wynne)
+
 ## [v1.1.1](https://github.com/cucumber/cucumber-rails/compare/v1.1.0...v1.1.1)
 
 ### Removed features
@@ -26,7 +34,6 @@ with a Step Definition that perhaps looks like this:
     Given /^I have signed up as "([^"]*)"$/ do |email|
       visit(signup_path)
       fill_in('Email', :with => email)
-      fill_in('Email', :with => email)
       fill_in('Password', :with => 's3cr3t')
       fill_in('Password Confirmation', :with => 's3cr3t')
       click_button('Sign up')

data/Rakefile

@@ -1,12 +1,14 @@
 # encoding: utf-8
 CUCUMBER_RAILS_VERSION = Gem::Specification.load(File.dirname(__FILE__) + '/cucumber-rails.gemspec').version.version
 require 'rubygems'
-require 'bundler/setup'
+require 'rake/clean'
+require 'bundler'
 Bundler::GemHelper.install_tasks
 
 $:.unshift(File.dirname(__FILE__) + '/lib')
 Dir["#{File.dirname(__FILE__)}/dev_tasks/*.rake"].sort.each { |ext| load ext }
 
+CLEAN.include('doc', 'tmp')
 
 # Needed for selenium browser
 # See http://about.travis-ci.org/docs/user/selenium-setup/
@@ -21,5 +23,5 @@ end
 if ENV['TRAVIS']
   task :default => :travis
 else
-  task :default => :cucumber
+  task :default => [:spec, :cucumber]
 end

data/cucumber-rails.gemspec

@@ -3,38 +3,38 @@ $LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = 'cucumber-rails'
-  s.version     = '1.1.1'
+  s.version     = '1.2.0'
   s.authors     = ["Aslak Hellesøy", "Dennis Blöte", "Rob Holland"]
-  s.description = "Cucumber Generators and Runtime for Rails"
+  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.0')
+  s.add_runtime_dependency('cucumber', '>= 1.1.1')
   s.add_runtime_dependency('nokogiri', '>= 1.5.0')
   s.add_runtime_dependency('capybara', '>= 1.1.1')
-  s.add_development_dependency('rails', '>= 3.1.0')
+  s.add_development_dependency('rails', '>= 3.1.1')
   s.add_development_dependency('rake', '>= 0.9.2')
-  s.add_development_dependency('bundler', '>= 1.0.18')
+  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('rspec', '>= 2.6.0')
-  s.add_development_dependency('rspec-rails', '>= 2.6.1')
-  s.add_development_dependency('ammeter', '>= 0.1.2')
-  s.add_development_dependency('factory_girl', '>= 2.1.0')
+  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.2.2')
-  s.add_development_dependency('bson_ext', '>= 1.3.1')
+  s.add_development_dependency('mongoid', '>= 2.3.3')
+  s.add_development_dependency('bson_ext', '>= 1.4.0')
 
   # Various Stuff that Rails 3.1 puts inside apps.
-  s.add_development_dependency('turn', '>= 0.8.2')
-  s.add_development_dependency('sass', '>= 3.1.7')
-  s.add_development_dependency('coffee-script', '>= 2.2.0')
-  s.add_development_dependency('uglifier', '>= 1.0.3')
-  s.add_development_dependency('jquery-rails', '>= 1.0.14')
+  s.add_development_dependency('turn', '>= 0.8.3')
+  s.add_development_dependency('sass-rails', '>= 3.1.4')
+  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')
 
   # For Documentation:
-  s.add_development_dependency('yard', '~> 0.7.2')
+  s.add_development_dependency('yard', '~> 0.7.3')
   s.add_development_dependency('rdiscount', '~> 1.6.8')
   s.add_development_dependency('bcat', '~> 0.6.2')
 

data/features/allow_rescue.feature

@@ -1,7 +1,7 @@
 Feature: Allow Cucumber to rescue exceptions
 
   Background: A controller that raises an exception
-    Given I have created a new Rails 3 app "rails-3-app" with cucumber-rails support
+    Given I have created a new Rails 3 app "rails-3-app" and installed cucumber-rails
     And I write to "app/controllers/posts_controller.rb" with:
       """
       class PostsController < ApplicationController

data/features/capybara_javascript_drivers.feature

@@ -1,7 +1,7 @@
 Feature: Capybara Javascript Drivers
 
   Background: A simple calendar app
-    Given I have created a new Rails 3 app "rails-3-app" with cucumber-rails support
+    Given I have created a new Rails 3 app and installed cucumber-rails
     And I successfully run `bundle exec rails g scaffold appointment name:string when:datetime`
     And I write to "features/step_definitions/date_time_steps.rb" with:
       """

data/features/choose_javascript_database_strategy.feature

@@ -0,0 +1,63 @@
+@announce
+Feature: Choose javascript database strategy
+
+  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 
+  Cucumber step definitions (e.g. using FactoryGirl) won't be visible to the web server
+  until the database transaction is committed.
+
+  So if you use a transaction strategy for cleaning up your database at the end of a scenario,
+  it won't work for javascript scenarios by default.
+
+  There are two ways around this. One is to switch to a truncation strategy for javascript
+  scenarios. This is slower, but more reliable.
+
+  The alternative is to patch ActiveRecord to share a single database connection between
+  threads. This means you still get the speed benefits of using a transaction to roll back
+  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.
+
+  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:
+      """
+      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:
+      """
+      @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/features/database_cleaner.feature

@@ -1,7 +1,7 @@
 Feature: DatabaseCleaner
 
   Scenario: Create records in background
-    Given I have created a new Rails 3 app "rails-3-app" with cucumber-rails support
+    Given I have created a new Rails 3 app and installed cucumber-rails
     And I write to "features/widgets.feature" with:
       """
       Feature: Create widgets

data/features/emulate_javascript.feature

@@ -1,7 +1,7 @@
 Feature: Emulate Javascript
 
   Scenario: See a widget
-    Given I have created a new Rails 3 app "widgets" with cucumber-rails support
+    Given I have created a new Rails 3 app and installed cucumber-rails
     And I successfully run `rails generate scaffold widget name:string`
     And I write to "features/f.feature" with:
       """
@@ -35,7 +35,7 @@ Feature: Emulate Javascript
        """
 
   Scenario: Pass on the CSRF token
-    Given I have created a new Rails 3 app "widgets" with cucumber-rails support
+    Given I have created a new Rails 3 app and installed cucumber-rails
     And I successfully run `rails generate scaffold widget name:string`
     And I successfully run `sed -i -e 's/forgery_protection *= false/forgery_protection = true/' config/environments/test.rb`
     And I successfully run `rails generate controller session establish`

data/features/field_with_errors.feature

@@ -1,7 +1,7 @@
 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 "enemies" with cucumber-rails support
+    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:
       """
@@ -27,7 +27,7 @@ Feature: Detecting a field has errors on it
        """
 
   Scenario: A formtastic form with some fields with errors
-    Given I have created a new Rails 3 app "enemies" with cucumber-rails support
+  Given I have created a new Rails 3 app and installed cucumber-rails
     And I append to "Gemfile" with:
       """
       gem "formtastic"

data/features/fixing_bundler_pre.feature

@@ -5,7 +5,7 @@ Feature: Fixing Bundler Pre
   
   @bundler-pre
   Scenario: Install Cucumber-Rails with bundler prerelease
-    Given I have created a new Rails 3 app "rails-3-app" with cucumber-rails support and cucumber-rails is outside of test group
+    Given I have created a new Rails 3 app and installed cucumber-rails, accidentally outside of the test group in my Gemfile
     And I successfully run `rake db:migrate`
     And I write to "features/tests.feature" with:
       """

data/features/inspect_query_string.feature

@@ -1,7 +1,7 @@
 Feature: Inspect query string
 
   Scenario: Inspect query string
-    Given I have created a new Rails 3 app "rails-3-app" with cucumber-rails support
+    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:
       """

data/features/install_cucumber_rails.feature

@@ -4,7 +4,7 @@ Feature: Rails 3
   of Rails 3 and Ruby, with Capybara, Spork and DatabaseCleaner
 
   Scenario: Install Cucumber-Rails
-    Given I have created a new Rails 3 app "rails-3-app" with cucumber-rails support
+    Given I have created a new Rails 3 app and installed cucumber-rails
     Then the following files should exist:
       | config/cucumber.yml                    |
       | script/cucumber                        |

data/features/multiple_databases.feature

@@ -4,7 +4,7 @@ Feature: Multiple Databases
   I want to specify explicit strategies for each
 
   Background: A Rails 3 app utilizing multiple database repositories exists
-    Given I have created a new Rails 3 app "rails-3-app" with cucumber-rails support
+    Given I have created a new Rails 3 app and installed cucumber-rails
     And I append to "config/database.yml" with:
       """
 

data/features/no_database.feature

@@ -2,7 +2,7 @@ Feature: No Database
   Allow Cucumber to work with a Rails app without a database
 
   Scenario: No ActiveRecord and DatabaseCleaner
-    Given I have created a new Rails 3 app "rails-3-app" with cucumber-rails support
+    Given I have created a new Rails 3 app "rails-3-app" and installed cucumber-rails
     # Turn off ActiveRecord
     And I write to "config/application.rb" with:
       """

data/features/rerun_profile.feature

@@ -4,7 +4,7 @@ Feature: Rerun profile
   I want to rerun only failing features
 
   Scenario: Rerun
-    Given I have created a new Rails 3 app "rails-3-app" with cucumber-rails support
+    Given I have created a new Rails 3 app and installed cucumber-rails
     And a file named "rerun.txt" with:
       """
       features/rerun_test.feature:2

data/features/rest_api.feature

@@ -1,7 +1,7 @@
 Feature: REST API
 
   Scenario: Compare JSON
-    Given I have created a new Rails 3 app "rails-3-app" with cucumber-rails support
+    Given I have created a new Rails 3 app "rails-3-app" and installed cucumber-rails
     And I write to "app/controllers/posts_controller.rb" with:
       """
       class PostsController < ApplicationController

data/features/routing.feature

@@ -1,7 +1,7 @@
 Feature: Routing
 
   Scenario: Visit undefined route
-    Given a project without ActiveRecord
+    Given I have created a new Rails 3 app with no database and installed cucumber-rails
     And I remove the file "public/index.html"
     And I write to "features/tests.feature" with:
       """

data/features/step_definitions/cucumber_rails_steps.rb

@@ -1,421 +1,75 @@
-module WebSteps
-  def create_web_steps
-    write_file('features/step_definitions/web_steps.rb', <<-EOF)
-# web_steps.rb used to be in Cucumber-Rails, but was removed in 1.1.0. We're still using them in the tests because
-# the tests were written while we still thought web_steps.rb was a good idea. We don't think so anymore:
-#
-#    http://groups.google.com/group/cukes/browse_thread/thread/26f80b93c94f2952
-#    https://github.com/cucumber/cucumber-rails/issues/174
-#    http://benmabey.com/2008/05/19/imperative-vs-declarative-scenarios-in-user-stories.html
-#    http://dannorth.net/2011/01/31/whose-domain-is-it-anyway/
-#    http://elabs.se/blog/15-you-re-cuking-it-wrong
-#
-# I'm sure someone will find this and paste it into their own projects. Go ahead. It's a bad idea.
-# You have been warned.
-#
-# Aslak
-
-require 'uri'
-require 'cgi'
-require File.expand_path(File.join(File.dirname(__FILE__), "..", "support", "paths"))
-
-module WithinHelpers
-  def with_scope(locator)
-    locator ? within(*selector_for(locator)) { yield } : yield
-  end
-end
-World(WithinHelpers)
-
-# Single-line step scoper
-When /^(.*) within (.*[^:])$/ do |step, parent|
-  with_scope(parent) { When step }
-end
-
-# Multi-line step scoper
-When /^(.*) within (.*[^:]):$/ do |step, parent, table_or_string|
-  with_scope(parent) { When "\#{step}:", table_or_string }
-end
-
-Given /^(?:|I )am on (.+)$/ do |page_name|
-  visit path_to(page_name)
-end
-
-When /^(?:|I )go to (.+)$/ do |page_name|
-  visit path_to(page_name)
-end
-
-When /^(?:|I )press "([^"]*)"$/ do |button|
-  click_button(button)
-end
-
-When /^(?:|I )follow "([^"]*)"$/ do |link|
-  click_link(link)
-end
-
-When /^(?:|I )fill in "([^"]*)" with "([^"]*)"$/ do |field, value|
-  fill_in(field, :with => value)
-end
-
-When /^(?:|I )fill in "([^"]*)" for "([^"]*)"$/ do |value, field|
-  fill_in(field, :with => value)
-end
-
-# Use this to fill in an entire form with data from a table. Example:
-#
-#   When I fill in the following:
-#     | Account Number | 5002       |
-#     | Expiry date    | 2009-11-01 |
-#     | Note           | Nice guy   |
-#     | Wants Email?   |            |
-#
-# TODO: Add support for checkbox, select or option
-# based on naming conventions.
-#
-When /^(?:|I )fill in the following:$/ do |fields|
-  fields.rows_hash.each do |name, value|
-    When %{I fill in "\#{name}" with "\#{value}"}
-  end
-end
-
-When /^(?:|I )select "([^"]*)" from "([^"]*)"$/ do |value, field|
-  select(value, :from => field)
-end
-
-When /^(?:|I )check "([^"]*)"$/ do |field|
-  check(field)
-end
-
-When /^(?:|I )uncheck "([^"]*)"$/ do |field|
-  uncheck(field)
-end
-
-When /^(?:|I )choose "([^"]*)"$/ do |field|
-  choose(field)
-end
-
-When /^(?:|I )attach the file "([^"]*)" to "([^"]*)"$/ do |path, field|
-  attach_file(field, File.expand_path(path))
-end
-
-Then /^(?:|I )should see "([^"]*)"$/ do |text|
-  if page.respond_to? :should
-    page.should have_content(text)
-  else
-    assert page.has_content?(text)
+module CucumberRailsHelper
+  def rails_new(options={})
+    options[:name] ||= 'test_app'
+    run_simple "rails new #{options[:name]} --skip-bundle --skip-test-unit #{options[:args]}"
+    assert_passing_with('README')
+    cd options[:name]
   end
-end
-
-Then /^(?:|I )should see \\/([^\\/]*)\\/$/ do |regexp|
-  regexp = Regexp.new(regexp)
 
-  if page.respond_to? :should
-    page.should have_xpath('//*', :text => regexp)
-  else
-    assert page.has_xpath?('//*', :text => regexp)
-  end
-end
-
-Then /^(?:|I )should not see "([^"]*)"$/ do |text|
-  if page.respond_to? :should
-    page.should have_no_content(text)
-  else
-    assert page.has_no_content?(text)
-  end
-end
-
-Then /^(?:|I )should not see \\/([^\\/]*)\\/$/ do |regexp|
-  regexp = Regexp.new(regexp)
-
-  if page.respond_to? :should
-    page.should have_no_xpath('//*', :text => regexp)
-  else
-    assert page.has_no_xpath?('//*', :text => regexp)
-  end
-end
-
-Then /^the "([^"]*)" field(?: within (.*))? should contain "([^"]*)"$/ do |field, parent, value|
-  with_scope(parent) do
-    field = find_field(field)
-    field_value = (field.tag_name == 'textarea') ? field.text : field.value
-    if field_value.respond_to? :should
-      field_value.should =~ /\#{value}/
+  def install_cucumber_rails(*options)
+    if options.include?(:not_in_test_group)
+      gem "cucumber-rails", :path => "#{File.expand_path('.')}"
     else
-      assert_match(/\#{value}/, field_value)
+      gem "cucumber-rails", :group => :test, :path => "#{File.expand_path('.')}"
     end
-  end
-end
-
-Then /^the "([^"]*)" field(?: within (.*))? should not contain "([^"]*)"$/ do |field, parent, value|
-  with_scope(parent) do
-    field = find_field(field)
-    field_value = (field.tag_name == 'textarea') ? field.text : field.value
-    if field_value.respond_to? :should_not
-      field_value.should_not =~ /\#{value}/
-    else
-      assert_no_match(/\#{value}/, field_value)
+    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)
+    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
-end
-
-Then /^the "([^"]*)" field should have the error "([^"]*)"$/ do |field, error_message|
-  element = find_field(field)
-  classes = element.find(:xpath, '..')[:class].split(' ')
-
-  form_for_input = element.find(:xpath, 'ancestor::form[1]')
-  using_formtastic = form_for_input[:class].include?('formtastic')
-  error_class = using_formtastic ? 'error' : 'field_with_errors'
-
-  if classes.respond_to? :should
-    classes.should include(error_class)
-  else
-    assert classes.include?(error_class)
-  end
-
-  if page.respond_to?(:should)
-    if using_formtastic
-      error_paragraph = element.find(:xpath, '../*[@class="inline-errors"][1]')
-      error_paragraph.should have_content(error_message)
-    else
-      page.should have_content("\#{field.titlecase} \#{error_message}")
-    end
-  else
-    if using_formtastic
-      error_paragraph = element.find(:xpath, '../*[@class="inline-errors"][1]')
-      assert error_paragraph.has_content?(error_message)
-    else
-      assert page.has_content?("\#{field.titlecase} \#{error_message}")
-    end
-  end
-end
-
-Then /^the "([^"]*)" field should have no error$/ do |field|
-  element = find_field(field)
-  classes = element.find(:xpath, '..')[:class].split(' ')
-  if classes.respond_to? :should
-    classes.should_not include('field_with_errors')
-    classes.should_not include('error')
-  else
-    assert !classes.include?('field_with_errors')
-    assert !classes.include?('error')
-  end
-end
-
-Then /^the "([^"]*)" checkbox(?: within (.*))? should be checked$/ do |label, parent|
-  with_scope(parent) do
-    field_checked = find_field(label)['checked']
-    if field_checked.respond_to? :should
-      field_checked.should be_true
-    else
-      assert field_checked
-    end
+  
+  def fixture(path)
+    File.expand_path(File.dirname(__FILE__) + "./../support/fixtures/#{path}")
   end
 end
+World(CucumberRailsHelper)
 
-Then /^the "([^"]*)" checkbox(?: within (.*))? should not be checked$/ do |label, parent|
-  with_scope(parent) do
-    field_checked = find_field(label)['checked']
-    if field_checked.respond_to? :should
-      field_checked.should be_false
-    else
-      assert !field_checked
-    end
-  end
-end
-
-Then /^(?:|I )should be on (.+)$/ do |page_name|
-  current_path = URI.parse(current_url).path
-  if current_path.respond_to? :should
-    current_path.should == path_to(page_name)
-  else
-    assert_equal path_to(page_name), current_path
-  end
-end
-
-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(',')} 
-
-  if actual_params.respond_to? :should
-    actual_params.should == expected_params
-  else
-    assert_equal expected_params, actual_params
-  end
-end
-
-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
-  #
-  #   When /^I go to (.+)$/ do |page_name|
-  #
-  # step definition in web_steps.rb
-  #
-  def path_to(page_name)
-    case page_name
-
-    when /^the home\s?page$/
-      '/'
-
-    # Add more mappings here.
-    # Here is an example that pulls values out of the Regexp:
-    #
-    #   when /^(.*)'s profile page$/i
-    #     user_profile_path(User.find_by_login($1))
-
-    else
-      begin
-        page_name =~ /^the (.*) page$/
-        path_components = $1.split(/\s+/)
-        self.send(path_components.push('path').join('_').to_sym)
-      rescue NoMethodError, ArgumentError
-        raise "Can't find mapping from \"\#{page_name}\" to a path.\\n" +
-          "Now, go and add a mapping in \#{__FILE__}"
-      end
-    end
-  end
-end
-
-World(NavigationHelpers)
-EOF
-  end
-end
-World(WebSteps)
-
-Given /^I have created a new Rails 3 app "([^"]*)" with cucumber\-rails support and cucumber-rails is outside of test group$/ do |app_name|
-  steps %Q{
-    When I successfully run `rails new #{app_name}`
-    Then it should pass with:
-      """
-      README
-      """
-    And I cd to "#{app_name}"
-    And I append to "Gemfile" with:
-      """
-      gem "cucumber-rails", :path => "../../.."
-      gem "capybara", :group => :test
-      gem "rspec-rails", :group => :test
-      gem "database_cleaner", :group => :test
-      gem 'factory_girl', :group => :test
-
-      """
-    And I successfully run `bundle exec rails generate cucumber:install`
-  }
+Given /^I have created a new Rails 3 app and installed cucumber\-rails, accidentally outside of the test group in my Gemfile$/ do
+  rails_new
+  install_cucumber_rails :not_in_test_group
   create_web_steps
-  if(ENV['ARUBA_REPORT_DIR'])
-    @aruba_report_start = Time.new
-    sleep(1)
-  end
+  prepare_aruba_report
 end
 
-Given /^I have created a new Rails 3 app "([^"]*)" with cucumber\-rails support$/ do |app_name|
-  steps %Q{
-    When I successfully run `rails new #{app_name}`
-    Then it should pass with:
-      """
-      README
-      """
-    And I cd to "#{app_name}"
-    And I append to "Gemfile" with:
-      """
-      gem "cucumber-rails", :group => :test, :path => "../../.."
-      gem "capybara", :group => :test
-      gem "rspec-rails", :group => :test
-      gem "database_cleaner", :group => :test
-      gem 'factory_girl', :group => :test
-
-      """
-    And I successfully run `bundle exec rails generate cucumber:install`
-  }
+Given /^I have created a new Rails 3 app "([^"]*)" and installed cucumber\-rails$/ do |app_name|
+  rails_new :name => app_name
+  install_cucumber_rails
   create_web_steps
-  if(ENV['ARUBA_REPORT_DIR'])
-    @aruba_report_start = Time.new
-    sleep(1)
-  end
+  prepare_aruba_report
 end
 
-Given /^a project without ActiveRecord$/ do
-  steps %Q{
-    Given I successfully run `rails new cuke-app`
-    And I cd to "cuke-app"
-    And I append to "Gemfile" with:
-      """
-      gem "cucumber-rails", :group => :test, :path => "../../.."
-      gem "capybara", :group => :test
-      gem "rspec-rails", :group => :test
-
-      """
-    And I successfully run `bundle exec rails generate cucumber:install`
-    And I overwrite "features/support/env.rb" with:
-      """
-      require 'cucumber/rails'
-
-      """
-
-    And I write to "config/application.rb" with:
-      """
-      require File.expand_path('../boot', __FILE__)
-
-      require 'action_controller/railtie'
-      require 'action_mailer/railtie'
-      require 'active_resource/railtie'
-      require 'rails/test_unit/railtie'
-
-      Bundler.require(:default, Rails.env) if defined?(Bundler)
-
-      module CukeApp
-        class Application < Rails::Application
-          config.encoding = "utf-8"
-          config.filter_parameters += [:password]
-        end
-      end
-
-      """
-    And I remove the file "config/database.yml"
-  }
+Given /^I have created a new Rails 3 app and installed cucumber\-rails$/ do
+  rails_new
+  install_cucumber_rails
   create_web_steps
-  if(ENV['ARUBA_REPORT_DIR'])
-    @aruba_report_start = Time.new
-    sleep(1)
-  end
+  prepare_aruba_report
 end
 
-Given /^a cukes resource$/ do
-  steps %Q{
-    Given I write to "config/routes.rb" with:
-      """
-      CukeApp::Application.routes.draw do
-        resources :cukes
-      end
-
-      """
-    And I write to "app/controllers/cukes_controller.rb" with:
-      """
-      class CukesController < ApplicationController
-        def index
-        end
-      end
-
-      """
-  }
+Given /^I have created a new Rails 3 app with no database and installed cucumber-rails$/ do
+  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
 
-Before('@bundler-pre') do
-  steps %Q{
-    Given I successfully run `gem uninstall bundler`
-    And I successfully run `gem install bundler --pre`
-  }
+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")
 end
 
-After('@bundler-pre') do
-  steps %Q{
-    Given I successfully run `gem uninstall bundler`
-    And I successfully run `gem install bundler`
-  }
+When /^I run the cukes$/ do
+  run_simple('bundle exec cucumber')
 end