From 613fbb6ffde8701b581b9a058cdf94cb81719277 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@mrzyx.de>
Date: Thu, 6 Dec 2012 10:37:11 +0100
Subject: [PATCH] lets see what travis has to say about the selenium prerelease

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

diff --git a/Gemfile b/Gemfile
index 0c5ba139d..67debb826 100644
--- a/Gemfile
+++ b/Gemfile
@@ -148,7 +148,7 @@ group :test do
   gem 'fixture_builder', '0.3.4'
   gem 'fuubar', '1.1.0'
   gem 'rspec-instafail', '0.2.4', :require => false
-  gem 'selenium-webdriver', '2.26.0'
+  gem 'selenium-webdriver', '>= 2.27.0.rc'
 
   gem 'webmock', '1.8.11', :require => false
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 397670596..0d8348baf 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -129,7 +129,7 @@ GEM
     faraday_middleware (0.9.0)
       faraday (>= 0.7.4, < 0.9)
     fastercsv (1.5.5)
-    ffi (1.1.5)
+    ffi (1.2.0)
     fixture_builder (0.3.4)
       activerecord (>= 2)
       activesupport (>= 2)
@@ -214,8 +214,9 @@ GEM
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
     kgio (2.7.4)
-    libwebsocket (0.1.5)
+    libwebsocket (0.1.7.1)
       addressable
+      websocket
     listen (0.5.3)
     lumberjack (1.0.2)
     mail (2.4.4)
@@ -230,7 +231,7 @@ GEM
     mobile-fu (1.1.0)
       rack-mobile-detect
       rails
-    multi_json (1.3.7)
+    multi_json (1.4.0)
     multipart-post (1.1.5)
     mysql2 (0.3.11)
     nested_form (0.2.3)
@@ -366,7 +367,7 @@ GEM
       railties (~> 3.2.0)
       sass (>= 3.1.10)
       tilt (~> 1.3)
-    selenium-webdriver (2.26.0)
+    selenium-webdriver (2.27.0.rc1)
       childprocess (>= 0.2.5)
       libwebsocket (~> 0.1.3)
       multi_json (~> 1.0)
@@ -412,6 +413,7 @@ GEM
     webmock (1.8.11)
       addressable (>= 2.2.7)
       crack (>= 0.1.7)
+    websocket (1.0.4)
     will_paginate (3.0.3)
     xpath (0.1.4)
       nokogiri (~> 1.3)
@@ -487,7 +489,7 @@ DEPENDENCIES
   rspec-rails (= 2.11.4)
   ruby-oembed (= 0.8.7)
   sass-rails (= 3.2.5)
-  selenium-webdriver (= 2.26.0)
+  selenium-webdriver (>= 2.27.0.rc)
   spork (= 1.0.0rc3)
   timecop (= 0.5.3)
   twitter (= 4.2.0)