From 03610c93de31febc1fd35b9f7501738286d2b459 Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Sun, 28 Oct 2012 12:28:55 +1100
Subject: [PATCH] Upgrade capybara and selenium-webdriver for compatibility
 with Firefox 16

---
 Gemfile.lock | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index a79ae3a26e..83954e36f3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -129,7 +129,7 @@ GEM
       i18n (~> 0.6)
       multi_json (~> 1.0)
     acts_as_list (0.1.4)
-    addressable (2.2.8)
+    addressable (2.3.2)
     andand (1.3.3)
     ansi (1.4.2)
     arel (3.0.2)
@@ -152,8 +152,8 @@ GEM
       rack-test (>= 0.5.4)
       selenium-webdriver (~> 2.0)
       xpath (~> 0.1.4)
-    childprocess (0.3.2)
-      ffi (~> 1.0.6)
+    childprocess (0.3.6)
+      ffi (~> 1.0, >= 1.0.6)
     cocaine (0.4.2)
     coderay (1.0.7)
     coffee-rails (3.2.2)
@@ -196,7 +196,7 @@ GEM
     faker (1.0.1)
       i18n (~> 0.4)
     ffaker (1.12.1)
-    ffi (1.0.11)
+    ffi (1.1.5)
     haml (3.1.6)
     highline (1.6.11)
     hike (1.2.1)
@@ -215,7 +215,7 @@ GEM
       railties (>= 3.0.0)
     kgio (2.7.4)
     libv8 (3.3.10.4)
-    libwebsocket (0.1.3)
+    libwebsocket (0.1.5)
       addressable
     mail (2.4.4)
       i18n (>= 0.4.0)
@@ -295,15 +295,14 @@ GEM
       activesupport (>= 3.0)
       railties (>= 3.0)
       rspec (~> 2.10.0)
-    rubyzip (0.9.8)
+    rubyzip (0.9.9)
     sass (3.1.19)
     sass-rails (3.2.5)
       railties (~> 3.2.0)
       sass (>= 3.1.10)
       tilt (~> 1.3)
-    selenium-webdriver (2.22.2)
+    selenium-webdriver (2.25.0)
       childprocess (>= 0.2.5)
-      ffi (~> 1.0)
       libwebsocket (~> 0.1.3)
       multi_json (~> 1.0)
       rubyzip