From 3174310ba01080a4953e3b3000e36a7140f60a3b Mon Sep 17 00:00:00 2001
From: flaburgan <flaburgan@geexxx.fr>
Date: Fri, 13 Dec 2013 16:48:01 +0100
Subject: [PATCH] Bump selenium, close #4621

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

diff --git a/.travis.yml b/.travis.yml
index 197cbf11e..ff6bdaa54 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,6 +19,8 @@ bundler_args: "--without development production heroku"
 before_install: "./script/ci/before_install.sh"
 script: "./script/ci/build.sh"
 
+addons:
+  firefox: "26.0"
 
 notifications:
   irc:
diff --git a/Gemfile b/Gemfile
index af3d8f8b9..892b7ca8b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -188,7 +188,7 @@ group :test do
 
   gem 'capybara',           '2.1.0'
   gem 'database_cleaner',   '1.1.0'
-  gem 'selenium-webdriver', '2.34.0'
+  gem 'selenium-webdriver', '2.39.0'
 
   # General helpers
 
diff --git a/Gemfile.lock b/Gemfile.lock
index f427e3823..d7e348189 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -115,7 +115,7 @@ GEM
       multipart-post (~> 1.2.0)
     faraday_middleware (0.9.0)
       faraday (>= 0.7.4, < 0.9)
-    ffi (1.9.0)
+    ffi (1.9.3)
     fixture_builder (0.3.6)
       activerecord (>= 2)
       activesupport (>= 2)
@@ -352,17 +352,17 @@ GEM
     ruby-hmac (0.4.0)
     ruby-oembed (0.8.9)
     ruby-progressbar (1.1.1)
-    rubyzip (0.9.9)
+    rubyzip (1.1.0)
     safe_yaml (0.9.5)
     sass (3.2.10)
     sass-rails (3.2.6)
       railties (~> 3.2.0)
       sass (>= 3.1.10)
       tilt (~> 1.3)
-    selenium-webdriver (2.34.0)
+    selenium-webdriver (2.39.0)
       childprocess (>= 0.2.5)
       multi_json (~> 1.0)
-      rubyzip
+      rubyzip (~> 1.0)
       websocket (~> 1.0.4)
     sidekiq (2.17.0)
       celluloid (>= 0.15.2)
@@ -491,7 +491,7 @@ DEPENDENCIES
   rspec-rails (= 2.13.2)
   ruby-oembed (= 0.8.9)
   sass-rails (= 3.2.6)
-  selenium-webdriver (= 2.34.0)
+  selenium-webdriver (= 2.39.0)
   sidekiq (= 2.17.0)
   sinatra (= 1.3.3)
   sinon-rails (= 1.7.3)