From 2361b8e00fd15e94a5c2bcf55965c4d598f8ad4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@mrzyx.de>
Date: Sun, 24 Aug 2014 01:57:49 +0200
Subject: [PATCH] bump capybara and phantomjs

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

diff --git a/Gemfile b/Gemfile
index 716f076f4..4bf3c052d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -192,7 +192,7 @@ group :test do
 
   # Cucumber (integration tests)
 
-  gem 'capybara',           '2.2.1'
+  gem 'capybara',           '2.4.1'
   gem 'database_cleaner',   '1.3.0'
   gem 'selenium-webdriver', '2.42.0'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index a29b1f6e6..ff99f8c6f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -59,7 +59,7 @@ GEM
     bootstrap-sass (2.3.2.2)
       sass (~> 3.2)
     builder (3.1.4)
-    capybara (2.2.1)
+    capybara (2.4.1)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
@@ -297,7 +297,7 @@ GEM
       addressable
       nokogiri
     orm_adapter (0.5.0)
-    phantomjs (1.9.2.1)
+    phantomjs (1.9.7.1)
     polyglot (0.3.5)
     pry (0.9.12.4)
       coderay (~> 1.0)
@@ -481,7 +481,7 @@ DEPENDENCIES
   asset_sync (= 1.0.0)
   backbone-on-rails (= 1.1.1)
   bootstrap-sass (= 2.3.2.2)
-  capybara (= 2.2.1)
+  capybara (= 2.4.1)
   carrierwave (= 0.10.0)
   compass-rails (= 2.0.0)
   configurate (= 0.0.8)