Update capybara

jgehtland · Jul 22, 2012 · 7589c99 · 7589c99
1 parent 2b27a36
commit 7589c99
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 14 deletions.
diff --git a/Gemfile b/Gemfile
@@ -44,7 +44,7 @@ gem "whenever", "~> 0.6.8"
 group :development, :test do
   gem "database_cleaner", "~> 0.6.7"
   gem "fabrication", "~> 1.2.0"
-  gem "capybara", "~> 1.0.1"
+  gem "capybara", "~> 1.1.2"
   gem "show_me_the_cookies", "~> 1.1.0"
   gem "rocco", :git => "git://github.com/rtomayko/rocco.git"
   gem "pygmentize", "~> 0.0.3"

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -113,15 +113,15 @@ GEM
     bson (1.3.1)
     bson_ext (1.3.1)
     builder (3.0.0)
-    capybara (1.0.1)
+    capybara (1.1.2)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       selenium-webdriver (~> 2.0)
       xpath (~> 0.1.4)
-    childprocess (0.2.1)
-      ffi (~> 1.0.6)
+    childprocess (0.3.4)
+      ffi (~> 1.0, >= 1.0.6)
     chunky_png (1.2.0)
     coffee-rails (3.1.1)
       coffee-script (>= 2.2.0)
@@ -147,7 +147,7 @@ GEM
       rack (>= 1.1.0, < 2)
     faraday_middleware (0.7.0)
       faraday (~> 0.7.3)
-    ffi (1.0.9)
+    ffi (1.1.0)
     fssm (0.2.7)
     haml (3.1.2)
     haml-rails (0.3.4)
@@ -162,17 +162,18 @@ GEM
       railties (~> 3.0)
       thor (~> 0.14)
     json (1.7.3)
-    json_pure (1.5.3)
     kgio (2.6.0)
     launchy (2.0.5)
       addressable (~> 2.2.6)
+    libwebsocket (0.1.4)
+      addressable
     libxml-ruby (2.1.2)
     mail (2.3.3)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     metaclass (0.0.1)
-    mime-types (1.18)
+    mime-types (1.19)
     minitest (2.12.1)
     mocha (0.11.1)
       metaclass (~> 0.0.1)
@@ -188,7 +189,7 @@ GEM
     mustache (0.99.4)
     net-ldap (0.2.2)
     newrelic_rpm (3.3.1)
-    nokogiri (1.5.0)
+    nokogiri (1.5.5)
     oauth (0.4.5)
     oauth2 (0.5.0)
       faraday (>= 0.6.1, < 0.8)
@@ -255,16 +256,16 @@ GEM
     ruby-openid-apps-discovery (1.2.0)
       ruby-openid (>= 2.1.7)
     rubyntlm (0.1.1)
-    rubyzip (0.9.4)
+    rubyzip (0.9.9)
     sass (3.1.7)
     sass-rails (3.1.0)
       actionpack (~> 3.1.0)
       railties (~> 3.1.0)
       sass (>= 3.1.4)
-    selenium-webdriver (2.4.0)
-      childprocess (>= 0.2.1)
-      ffi (>= 1.0.7)
-      json_pure
+    selenium-webdriver (2.25.0)
+      childprocess (>= 0.2.5)
+      libwebsocket (~> 0.1.3)
+      multi_json (~> 1.0)
       rubyzip
     show_me_the_cookies (1.1.0)
       capybara (~> 1.0)
@@ -313,7 +314,7 @@ DEPENDENCIES
   airbrake (~> 3.0.9)
   bcrypt-ruby (~> 3.0.0)
   bson_ext (~> 1.3.1)
-  capybara (~> 1.0.1)
+  capybara (~> 1.1.2)
   coffee-rails (~> 3.1.0)
   compass!
   database_cleaner (~> 0.6.7)