From 48a38231afc8043b5dcd532c35b6a0bc83986abf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@mrzyx.de>
Date: Sun, 1 Jun 2014 13:44:56 +0200
Subject: [PATCH] bump selenium-webdriver

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

diff --git a/Gemfile b/Gemfile
index a89e8d5bd..4ec319a97 100644
--- a/Gemfile
+++ b/Gemfile
@@ -195,7 +195,7 @@ group :test do
 
   gem 'capybara',           '2.2.1'
   gem 'database_cleaner',   '1.3.0'
-  gem 'selenium-webdriver', '2.39.0'
+  gem 'selenium-webdriver', '2.42.0'
 
   # General helpers
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 10a578271..639dca6eb 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -67,7 +67,7 @@ GEM
       mime-types (>= 1.16)
     celluloid (0.15.2)
       timers (~> 1.1.0)
-    childprocess (0.3.9)
+    childprocess (0.5.3)
       ffi (~> 1.0, >= 1.0.11)
     chunky_png (1.3.1)
     coderay (1.1.0)
@@ -389,15 +389,15 @@ GEM
       rspec-mocks (~> 2.14.0)
     ruby-oembed (0.8.9)
     ruby-progressbar (1.5.1)
-    rubyzip (1.1.0)
+    rubyzip (1.1.4)
     safe_yaml (0.9.7)
     sass (3.2.19)
     sass-rails (3.2.6)
       railties (~> 3.2.0)
       sass (>= 3.1.10)
       tilt (~> 1.3)
-    selenium-webdriver (2.39.0)
-      childprocess (>= 0.2.5)
+    selenium-webdriver (2.42.0)
+      childprocess (>= 0.5.0)
       multi_json (~> 1.0)
       rubyzip (~> 1.0)
       websocket (~> 1.0.4)
@@ -537,7 +537,7 @@ DEPENDENCIES
   rspec-rails (= 2.14.2)
   ruby-oembed (= 0.8.9)
   sass-rails (= 3.2.6)
-  selenium-webdriver (= 2.39.0)
+  selenium-webdriver (= 2.42.0)
   sidekiq (= 2.17.2)
   sinatra (= 1.3.3)
   sinon-rails (= 1.7.3)