From d471308732c1b2d1081891f5c30133ca9c221fc6 Mon Sep 17 00:00:00 2001
From: Jens Ulferts <j.ulferts@finn.de>
Date: Thu, 26 Jun 2014 16:19:11 +0200
Subject: [PATCH] updates capybara & selenium and fixes their versions

---
 Gemfile      |  4 ++--
 Gemfile.lock | 22 ++++++++++++----------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/Gemfile b/Gemfile
index 3d0901929f..6d0ff18808 100644
--- a/Gemfile
+++ b/Gemfile
@@ -159,9 +159,9 @@ group :test do
   # also add to development group, so "spec" rake task gets loaded
   gem "rspec-rails", "~> 2.14", :group => :development
   gem 'rspec-example_disabler', git: "https://github.com/finnlabs/rspec-example_disabler.git"
-  gem 'capybara'
+  gem 'capybara', '~> 2.3.0'
   gem 'capybara-screenshot'
-  gem 'selenium-webdriver'
+  gem 'selenium-webdriver', '~> 2.42.0'
   gem 'timecop', "~> 0.6.1"
 
   gem 'rb-readline', "~> 0.5.1" # ruby on CI needs this
diff --git a/Gemfile.lock b/Gemfile.lock
index c5ba43a2de..47154eecf9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -105,7 +105,7 @@ GEM
     byebug (2.7.0)
       columnize (~> 0.3)
       debugger-linecache (~> 1.2)
-    capybara (2.2.1)
+    capybara (2.3.0)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
@@ -113,7 +113,7 @@ GEM
       xpath (~> 2.0)
     capybara-screenshot (0.3.6)
       capybara (>= 1.0, < 3)
-    childprocess (0.3.9)
+    childprocess (0.5.3)
       ffi (~> 1.0, >= 1.0.11)
     chunky_png (1.3.1)
     climate_control (0.0.3)
@@ -237,15 +237,17 @@ GEM
     metaclass (0.0.1)
     method_source (0.8.2)
     mime-types (1.25.1)
+    mini_portile (0.6.0)
     minisyntax (0.2.3)
     mocha (0.13.3)
       metaclass (~> 0.0.1)
-    multi_json (1.9.3)
+    multi_json (1.10.1)
     multi_test (0.0.2)
     multi_xml (0.5.5)
     mysql2 (0.3.11)
     net-ldap (0.2.2)
-    nokogiri (1.5.11)
+    nokogiri (1.6.2.1)
+      mini_portile (= 0.6.0)
     non-stupid-digest-assets (1.0.4)
     object-daddy (1.1.1)
     oj (2.1.6)
@@ -355,12 +357,12 @@ GEM
     rubytree (0.8.3)
       json (>= 1.7.5)
       structured_warnings (>= 0.1.3)
-    rubyzip (1.1.0)
+    rubyzip (1.1.4)
     sass (3.3.7)
-    selenium-webdriver (2.39.0)
-      childprocess (>= 0.2.5)
+    selenium-webdriver (2.42.0)
+      childprocess (>= 0.5.0)
       multi_json (~> 1.0)
-      rubyzip
+      rubyzip (~> 1.0)
       websocket (~> 1.0.4)
     shoulda (3.5.0)
       shoulda-context (~> 1.0, >= 1.0.1)
@@ -433,7 +435,7 @@ DEPENDENCIES
   acts_as_list (~> 0.2.0)
   awesome_nested_set
   bourbon (~> 4.0)
-  capybara
+  capybara (~> 2.3.0)
   capybara-screenshot
   cocaine
   codeclimate-test-reporter
@@ -499,7 +501,7 @@ DEPENDENCIES
   rubytree (~> 0.8.3)
   sass (~> 3.3.6)
   sass-rails!
-  selenium-webdriver
+  selenium-webdriver (~> 2.42.0)
   shoulda
   shoulda-matchers
   simplecov (= 0.8.0.pre)