Merge remote branch 'stevenheidel/master'

resolve · Aug 26, 2010 · 7ee76a8 · 7ee76a8
2 parents 53286ca + bef87db
commit 7ee76a8
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/Gemfile b/Gemfile
@@ -77,6 +77,8 @@ group :test do
   gem 'spork' unless RUBY_PLATFORM =~ /mswin|mingw/
   gem 'launchy'
   gem 'gherkin'
+  # TODO: Change back to gem when patch is merged in
+  gem 'rack-test', :git => 'git://github.com/alan/rack-test.git'
   # FIXME: JSON constant constants warnings
   gem 'json_pure',          '~> 1.4.6', :require => 'json/pure'
   # Factory Girl

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,3 +1,10 @@
+GIT
+  remote: git://github.com/alan/rack-test.git
+  revision: 167c2b2
+  specs:
+    rack-test (0.5.4)
+      rack (>= 1.0)
+
 GIT
   remote: git://github.com/parndt/acts_as_tree.git
   revision: cd4d6a6
@@ -130,8 +137,6 @@ GEM
       rack (>= 0.4)
     rack-mount (0.6.12)
       rack (>= 1.0.0)
-    rack-test (0.5.4)
-      rack (>= 1.0)
     rails (3.0.0.rc2)
       actionmailer (= 3.0.0.rc2)
       actionpack (= 3.0.0.rc2)
@@ -193,6 +198,7 @@ DEPENDENCIES
   gherkin
   json_pure (~> 1.4.6)
   launchy
+  rack-test!
   rails (= 3.0.0.rc2)
   refinerycms!
   refinerycms-i18n!