From 2df033cf1180a24e6c32bc40afb07bce63f0db8a Mon Sep 17 00:00:00 2001
From: "depfu[bot]" <depfu[bot]@users.noreply.github.com>
Date: Thu, 4 Jan 2018 14:00:47 +0000
Subject: [PATCH] Upgrade capybara to version 2.17.0

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

diff --git a/Gemfile b/Gemfile
index 94002104e..1c5beb7d3 100644
--- a/Gemfile
+++ b/Gemfile
@@ -73,7 +73,7 @@ group :development, :test do
 end
 
 group :test do
-  gem 'capybara', '~> 2.14.0'
+  gem 'capybara', '~> 2.17.0'
   gem 'coveralls', '~> 0.8.21', require: false
   gem 'database_cleaner', '~> 1.6.1'
   gem 'email_spec', '~> 2.1.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index d7d210576..32eee58f2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -39,8 +39,8 @@ GEM
     acts-as-taggable-on (4.0.0)
       activerecord (>= 4.0)
     acts_as_votable (0.10.0)
-    addressable (2.5.1)
-      public_suffix (~> 2.0, >= 2.0.2)
+    addressable (2.5.2)
+      public_suffix (>= 2.0.2, < 4.0)
     ahoy_matey (1.6.0)
       addressable
       browser (~> 2.0)
@@ -87,13 +87,13 @@ GEM
     capistrano3-delayed-job (1.7.3)
       capistrano (~> 3.0, >= 3.0.0)
       daemons (~> 1.2.4)
-    capybara (2.14.4)
+    capybara (2.17.0)
       addressable
-      mime-types (>= 1.16)
+      mini_mime (>= 0.1.3)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
-      xpath (~> 2.0)
+      xpath (>= 2.0, < 4.0)
     chronic (0.10.2)
     ckeditor (4.2.4)
       cocaine
@@ -316,7 +316,7 @@ GEM
       cliver (~> 0.3.1)
       websocket-driver (>= 0.2.0)
     powerpack (0.1.1)
-    public_suffix (2.0.5)
+    public_suffix (3.0.1)
     quiet_assets (1.1.0)
       railties (>= 3.1, < 5.0)
     rack (1.6.8)
@@ -483,8 +483,8 @@ GEM
     websocket-extensions (0.1.2)
     whenever (0.9.7)
       chronic (>= 0.6.3)
-    xpath (2.1.0)
-      nokogiri (~> 1.3)
+    xpath (3.0.0)
+      nokogiri (~> 1.8)
 
 PLATFORMS
   ruby
@@ -502,7 +502,7 @@ DEPENDENCIES
   capistrano-bundler (~> 1.2)
   capistrano-rails (~> 1.2.3)
   capistrano3-delayed-job (~> 1.7.3)
-  capybara (~> 2.14.0)
+  capybara (~> 2.17.0)
   ckeditor (~> 4.2.3)
   cocoon (~> 1.2.9)
   coffee-rails (~> 4.2.1)