From 6344d43432579241df9e5b111927e0b4ec38ad18 Mon Sep 17 00:00:00 2001
From: Steven Hancock <stevenh512@gmail.com>
Date: Sun, 17 Jun 2012 18:20:42 -0700
Subject: [PATCH] Update Cucumber and Selenium

Attempting to appease the Travis Bot
---
 Gemfile      |  2 +-
 Gemfile.lock | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Gemfile b/Gemfile
index e1e6487d8..cb959b5b2 100644
--- a/Gemfile
+++ b/Gemfile
@@ -153,7 +153,7 @@ group :test do
   gem 'fixture_builder', '0.3.3'
   gem 'fuubar', '>= 1.0'
   gem 'rspec-instafail', '>= 0.1.7', :require => false
-  gem 'selenium-webdriver', '2.22.1'
+  gem 'selenium-webdriver', '~> 2.22.1'
 
   gem 'webmock', '~> 1.7', :require => false
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 985408116..dbfd6d36b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -118,10 +118,10 @@ GEM
     coffee-script-source (1.3.3)
     columnize (0.3.6)
     crack (0.3.1)
-    cucumber (1.2.0)
+    cucumber (1.2.1)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.3)
-      gherkin (~> 2.10.0)
+      gherkin (~> 2.11.0)
       json (>= 1.4.6)
     cucumber-rails (1.3.0)
       capybara (>= 1.1.2)
@@ -178,7 +178,7 @@ GEM
       rspec (~> 2.0)
       rspec-instafail (~> 0.2.0)
       ruby-progressbar (~> 0.0.10)
-    gherkin (2.10.0)
+    gherkin (2.11.0)
       json (>= 1.4.6)
     gon (3.0.4)
       actionpack (>= 2.3.0)
@@ -401,13 +401,13 @@ GEM
     ruby-hmac (0.4.0)
     ruby-oembed (0.8.7)
     ruby-progressbar (0.0.10)
-    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.1)
+    selenium-webdriver (2.22.2)
       childprocess (>= 0.2.5)
       ffi (~> 1.0)
       libwebsocket (~> 0.1.3)
@@ -540,7 +540,7 @@ DEPENDENCIES
   ruby-debug
   ruby-oembed (~> 0.8.7)
   sass-rails (= 3.2.5)
-  selenium-webdriver (= 2.22.1)
+  selenium-webdriver (~> 2.22.1)
   settingslogic!
   spork (~> 1.0rc2)
   thin (~> 1.3.1)