From 59ca3c97890ca690afa3d2516f9bd319020334fe Mon Sep 17 00:00:00 2001
From: Matthew Horan <matt@matthoran.com>
Date: Thu, 3 Jan 2013 13:55:55 -0500
Subject: [PATCH] Bump Capybara dependency to 2.0.2

Required for Capybara::SpecHelper.configure.
---
 Gemfile.lock            | 18 +++++++++---------
 capybara-webkit.gemspec |  2 +-
 spec/spec_helper.rb     |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index d2fc513..983fe20 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -2,7 +2,7 @@ PATH
   remote: .
   specs:
     capybara-webkit (0.13.0)
-      capybara (>= 2.0.1)
+      capybara (~> 2.0, >= 2.0.2)
       json
 
 GEM
@@ -12,7 +12,7 @@ GEM
     appraisal (0.4.0)
       bundler
       rake
-    capybara (2.0.1)
+    capybara (2.0.2)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
@@ -23,16 +23,15 @@ GEM
       ffi (~> 1.0, >= 1.0.6)
     diff-lcs (1.1.2)
     ffi (1.2.0)
-    ffi (1.2.0-x86-mingw32)
-    json (1.7.5)
-    libwebsocket (0.1.5)
+    json (1.7.6)
+    libwebsocket (0.1.7.1)
       addressable
+      websocket
     mime-types (1.19)
     mini_magick (3.2.1)
       subexec (~> 0.0.4)
-    multi_json (1.3.7)
-    nokogiri (1.5.5)
-    nokogiri (1.5.5-x86-mingw32)
+    multi_json (1.5.0)
+    nokogiri (1.5.6)
     rack (1.4.1)
     rack-test (0.6.2)
       rack (>= 1.0)
@@ -46,7 +45,7 @@ GEM
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.6.0)
     rubyzip (0.9.9)
-    selenium-webdriver (2.26.0)
+    selenium-webdriver (2.27.2)
       childprocess (>= 0.2.5)
       libwebsocket (~> 0.1.3)
       multi_json (~> 1.0)
@@ -56,6 +55,7 @@ GEM
       tilt (~> 1.2)
     subexec (0.0.4)
     tilt (1.2.2)
+    websocket (1.0.6)
     xpath (1.0.0)
       nokogiri (~> 1.3)
 
diff --git a/capybara-webkit.gemspec b/capybara-webkit.gemspec
index 03e588e..1f2ab6c 100644
--- a/capybara-webkit.gemspec
+++ b/capybara-webkit.gemspec
@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
 
   s.extensions = "extconf.rb"
 
-  s.add_runtime_dependency("capybara", [">= 2.0.1"])
+  s.add_runtime_dependency("capybara", "~> 2.0", ">= 2.0.2")
   s.add_runtime_dependency("json")
 
   s.add_development_dependency("rspec", "~> 2.6.0")
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index cb32454..dfddaf0 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -33,7 +33,7 @@ end
 
 RSpec.configure do |c|
   c.filter_run_excluding :skip_on_windows => !(RbConfig::CONFIG['host_os'] =~ /mingw32/).nil?
-  c.before { Capybara.app_host = nil }
+  Capybara::SpecHelper.configure(c)
 end
 
 def with_env_vars(vars)