From f166bf22e6b3e5683a73e536bcedd4cc1ce9990b Mon Sep 17 00:00:00 2001
From: "Hongli Lai (Phusion)" <hongli@phusion.nl>
Date: Sun, 22 Apr 2012 10:42:24 +0200
Subject: [PATCH] Upgrade capybara-webkit

---
 Gemfile.lock | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 791e2670..cf11b774 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -42,9 +42,10 @@ GEM
       rack-test (>= 0.5.4)
       selenium-webdriver (~> 2.0)
       xpath (~> 0.1.4)
-    capybara-webkit (0.7.2)
+    capybara-webkit (0.11.0)
       capybara (>= 1.0.0, < 1.2)
-    childprocess (0.2.8)
+      json
+    childprocess (0.3.2)
       ffi (~> 1.0.6)
     coffee-rails (3.1.1)
       coffee-script (>= 2.2.0)
@@ -94,14 +95,16 @@ GEM
     json (1.6.4)
     launchy (2.0.5)
       addressable (~> 2.2.6)
+    libwebsocket (0.1.3)
+      addressable
     mail (2.3.0)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.17.2)
+    mime-types (1.18)
     multi_json (1.0.4)
     mysql2 (0.3.10)
-    nokogiri (1.5.0)
+    nokogiri (1.5.2)
     orm_adapter (0.0.6)
     polyglot (0.3.3)
     rack (1.3.6)
@@ -145,7 +148,7 @@ GEM
       activesupport (>= 3.0)
       railties (>= 3.0)
       rspec (~> 2.8.0)
-    rubyzip (0.9.5)
+    rubyzip (0.9.7)
     sass (3.1.12)
     sass-rails (3.1.5)
       actionpack (~> 3.1.0)
@@ -155,10 +158,11 @@ GEM
     schema_plus (0.2.1)
       rails
       valuable
-    selenium-webdriver (2.16.0)
+    selenium-webdriver (2.21.2)
       childprocess (>= 0.2.5)
-      ffi (~> 1.0.9)
-      multi_json (~> 1.0.4)
+      ffi (~> 1.0)
+      libwebsocket (~> 0.1.3)
+      multi_json (~> 1.0)
       rubyzip
     spork (0.9.0.rc9)
     sprockets (2.0.3)