From 4d4d11b90b0225f6b3af1f683482d46d3548df8a Mon Sep 17 00:00:00 2001
From: danielgrippi <danielgrippi@gmail.com>
Date: Wed, 17 Aug 2011 12:48:52 -0700
Subject: [PATCH] upgrade selenium-webdriver to 2.4 for FF6 support

---
 Gemfile      | 2 +-
 Gemfile.lock | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Gemfile b/Gemfile
index 3a8199dd7..91c15f150 100644
--- a/Gemfile
+++ b/Gemfile
@@ -103,7 +103,7 @@ end
 group :test do
   gem 'factory_girl_rails'
   gem 'fixture_builder', '0.2.2'
-  gem 'selenium-webdriver', '0.2.2'
+  gem 'selenium-webdriver', '2.4'
   gem 'capybara', '~> 0.3.9'
   gem 'cucumber-rails', '0.3.2'
   gem 'rspec', '>= 2.0.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index 15d2b5f03..0aa586894 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -143,7 +143,7 @@ GEM
       ohai (>= 0.5.7)
       rest-client (< 1.7.0, >= 1.0.4)
       uuidtools
-    childprocess (0.2.0)
+    childprocess (0.2.1)
       ffi (~> 1.0.6)
     closure-compiler (1.1.1)
     cloudfiles (1.4.10)
@@ -399,8 +399,8 @@ GEM
     rubyntlm (0.1.1)
     rubyzip (0.9.4)
     sass (3.1.4)
-    selenium-webdriver (0.2.2)
-      childprocess (>= 0.1.9)
+    selenium-webdriver (2.4.0)
+      childprocess (>= 0.2.1)
       ffi (>= 1.0.7)
       json_pure
       rubyzip
@@ -511,7 +511,7 @@ DEPENDENCIES
   ruby-debug
   ruby-debug19
   sass (= 3.1.4)
-  selenium-webdriver (= 0.2.2)
+  selenium-webdriver (= 2.4)
   settingslogic (= 2.0.6)
   sod!
   sqlite3