From 60df7cf072a3e0b223c5739db9961d7415e8dafe Mon Sep 17 00:00:00 2001
From: Alvaro Bautista <alvarobp@gmail.com>
Date: Fri, 2 Sep 2011 13:26:32 +0200
Subject: [PATCH] Use capybara 1.1.0.rc1 to address exit_code bug

---
 Gemfile      |  2 +-
 Gemfile.lock | 22 ++++++++++------------
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/Gemfile b/Gemfile
index e4b9e7211b..28d360969b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -28,7 +28,7 @@ group :test, :development do
   gem "steak"
   gem "rspec-rails"
   gem "launchy"
-  gem "capybara"
+  gem "capybara", "~> 1.1.0.rc1"
   gem "webrat"
   gem "timecop"
   gem "email_spec"
diff --git a/Gemfile.lock b/Gemfile.lock
index f7042f1fd3..9f135ac6cb 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -64,21 +64,17 @@ GEM
       xml-simple
       xml-simple
     builder (2.1.2)
-    capybara (0.4.1.2)
-      celerity (>= 0.7.9)
-      culerity (>= 0.2.4)
+    capybara (1.1.0.rc1)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
-      selenium-webdriver (>= 0.0.27)
-      xpath (~> 0.1.3)
-    celerity (0.9.0)
-    childprocess (0.1.9)
+      selenium-webdriver (~> 2.0)
+      xpath (~> 0.1.4)
+    childprocess (0.2.2)
       ffi (~> 1.0.6)
     choice (0.1.4)
     columnize (0.3.4)
-    culerity (0.2.15)
     daemon_controller (0.2.6)
     diff-lcs (1.1.3)
     email_spec (1.2.1)
@@ -95,7 +91,8 @@ GEM
     htmlentities (4.3.0)
     i18n (0.5.0)
     json (1.5.3)
-    json_pure (1.5.3)
+    json_pure (1.5.4)
+      spruz (~> 0.2.8)
     launchy (2.0.5)
       addressable (~> 2.2.6)
     linecache19 (0.5.12)
@@ -186,8 +183,8 @@ GEM
     ruby_core_source (0.1.5)
       archive-tar-minitar (>= 0.5.2)
     rubyzip (0.9.4)
-    selenium-webdriver (2.3.2)
-      childprocess (>= 0.1.9)
+    selenium-webdriver (2.5.0)
+      childprocess (>= 0.2.1)
       ffi (>= 1.0.7)
       json_pure
       rubyzip
@@ -198,6 +195,7 @@ GEM
       tilt (< 2.0, >= 1.2.2)
     spreadsheet (0.6.5.7)
       ruby-ole (>= 1.0)
+    spruz (0.2.13)
     steak (1.1.0)
       rspec (>= 1.3)
     text-hyphen (1.2)
@@ -228,7 +226,7 @@ PLATFORMS
 
 DEPENDENCIES
   aws-ses (= 0.4.1)
-  capybara
+  capybara (~> 1.1.0.rc1)
   cartodb-importer!
   email_spec
   exception_notification