From 7cdd05d67fb2caca96d01928526f327a7974dd09 Mon Sep 17 00:00:00 2001
From: Mike Burns <mburns@thoughtbot.com>
Date: Fri, 10 Jun 2011 09:55:55 -0400
Subject: [PATCH] Lock down the Rails version so we're not influenced by the
 very newest version of Rails when we're trying to fix an unrelated bug.

---
 .bundle/config                    |  4 +-
 Gemfile                           |  2 +-
 Gemfile.lock                      | 61 +++++++++++++++++++++++++++++++
 features/load_definitions.feature |  6 +--
 4 files changed, 67 insertions(+), 6 deletions(-)

diff --git a/.bundle/config b/.bundle/config
index 8ebbe30..20670d5 100644
--- a/.bundle/config
+++ b/.bundle/config
@@ -1,2 +1,2 @@
---- 
-BUNDLE_DISABLE_SHARED_GEMS: "1"
+--- {}
+
diff --git a/Gemfile b/Gemfile
index dd8b0f1..677e276 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,4 +3,4 @@ gem "cucumber"
 gem "aruba"
 gem "rake"
 gem "rspec"
-
+gem 'rails', '3.0.7'
diff --git a/Gemfile.lock b/Gemfile.lock
index 4e57b0b..1c85668 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,6 +1,34 @@
 GEM
   remote: http://rubygems.org/
   specs:
+    abstract (1.0.0)
+    actionmailer (3.0.7)
+      actionpack (= 3.0.7)
+      mail (~> 2.2.15)
+    actionpack (3.0.7)
+      activemodel (= 3.0.7)
+      activesupport (= 3.0.7)
+      builder (~> 2.1.2)
+      erubis (~> 2.6.6)
+      i18n (~> 0.5.0)
+      rack (~> 1.2.1)
+      rack-mount (~> 0.6.14)
+      rack-test (~> 0.5.7)
+      tzinfo (~> 0.3.23)
+    activemodel (3.0.7)
+      activesupport (= 3.0.7)
+      builder (~> 2.1.2)
+      i18n (~> 0.5.0)
+    activerecord (3.0.7)
+      activemodel (= 3.0.7)
+      activesupport (= 3.0.7)
+      arel (~> 2.0.2)
+      tzinfo (~> 0.3.23)
+    activeresource (3.0.7)
+      activemodel (= 3.0.7)
+      activesupport (= 3.0.7)
+    activesupport (3.0.7)
+    arel (2.0.10)
     aruba (0.2.3)
       background_process
       cucumber (~> 0.9.0)
@@ -13,10 +41,38 @@ GEM
       json (~> 1.4.6)
       term-ansicolor (~> 1.0.5)
     diff-lcs (1.1.2)
+    erubis (2.6.6)
+      abstract (>= 1.0.0)
     gherkin (2.2.8)
       json (~> 1.4.6)
       term-ansicolor (~> 1.0.5)
+    i18n (0.5.0)
     json (1.4.6)
+    mail (2.2.19)
+      activesupport (>= 2.3.6)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.16)
+    polyglot (0.3.1)
+    rack (1.2.3)
+    rack-mount (0.6.14)
+      rack (>= 1.0.0)
+    rack-test (0.5.7)
+      rack (>= 1.0)
+    rails (3.0.7)
+      actionmailer (= 3.0.7)
+      actionpack (= 3.0.7)
+      activerecord (= 3.0.7)
+      activeresource (= 3.0.7)
+      activesupport (= 3.0.7)
+      bundler (~> 1.0)
+      railties (= 3.0.7)
+    railties (3.0.7)
+      actionpack (= 3.0.7)
+      activesupport (= 3.0.7)
+      rake (>= 0.8.7)
+      thor (~> 0.14.4)
     rake (0.8.7)
     rspec (2.0.0)
       rspec-core (= 2.0.0)
@@ -29,6 +85,10 @@ GEM
       rspec-core (= 2.0.0)
       rspec-expectations (= 2.0.0)
     term-ansicolor (1.0.5)
+    thor (0.14.6)
+    treetop (1.4.9)
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.27)
 
 PLATFORMS
   ruby
@@ -36,5 +96,6 @@ PLATFORMS
 DEPENDENCIES
   aruba
   cucumber
+  rails (= 3.0.7)
   rake
   rspec
diff --git a/features/load_definitions.feature b/features/load_definitions.feature
index cb36281..7410d4c 100644
--- a/features/load_definitions.feature
+++ b/features/load_definitions.feature
@@ -2,7 +2,7 @@ Feature: automatically load step definitions
 
   @disable-bundler
   Scenario: generate a rails 3 application and use factory definitions
-    When I successfully run "rails new testapp"
+    When I successfully run "bundle exec rails new testapp"
     And I cd to "testapp"
     And I add "factory_girl_rails" from this project as a dependency
     When I successfully run "bundle install"
@@ -16,7 +16,7 @@ Feature: automatically load step definitions
         end
       end
       """
-    When I successfully run "rake db:migrate --trace"
+    When I successfully run "bundle exec rake db:migrate --trace"
     And I write to "app/models/user.rb" with:
       """
       class User < ActiveRecord::Base
@@ -39,5 +39,5 @@ Feature: automatically load step definitions
         end
       end
       """
-    When I successfully run "rake test --trace"
+    When I successfully run "bundle exec rake test --trace"
     Then the output should contain "1 tests, 1 assertions, 0 failures, 0 errors"