From eadbc82c47fd157ed4f1eb4c4983ab0734023106 Mon Sep 17 00:00:00 2001
From: eileencodes <eileencodes@gmail.com>
Date: Fri, 17 Mar 2017 08:18:55 -0400
Subject: [PATCH] Bump Capybara and include Minitest::Assertions

Capybara was updated in teamcapybara/capybara#1841 to use Minitest style
assertions so that system test output shows x number of assertions, x
numbe of failures, etc.

Before:

```
6 runs, 0 assertions, 0 failures, 0 errors, 0 skips
```

After:

```
6 runs, 7 assertions, 1 failures, 0 errors, 0 skips
```

This change bumps Capybara from 2.7.0 to 2.13.0 and includes the
required minitest assertion file in the test case. :tada:
---
 Gemfile                                                   | 2 +-
 Gemfile.lock                                              | 4 ++--
 actionpack/lib/action_dispatch/system_test_case.rb        | 2 ++
 railties/lib/rails/generators/rails/app/templates/Gemfile | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Gemfile b/Gemfile
index 924232d701..6f0bc534df 100644
--- a/Gemfile
+++ b/Gemfile
@@ -14,7 +14,7 @@ gem "rake", ">= 11.1"
 # be loaded after loading the test library.
 gem "mocha", "~> 0.14", require: false
 
-gem "capybara", "~> 2.7.0"
+gem "capybara", "~> 2.13.0"
 
 gem "rack-cache", "~> 1.2"
 gem "jquery-rails"
diff --git a/Gemfile.lock b/Gemfile.lock
index 68c69f75a0..580333f6e6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -120,7 +120,7 @@ GEM
     bunny (2.6.2)
       amq-protocol (>= 2.0.1)
     byebug (9.0.6)
-    capybara (2.7.1)
+    capybara (2.13.0)
       addressable
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
@@ -377,7 +377,7 @@ DEPENDENCIES
   blade
   blade-sauce_labs_plugin
   byebug
-  capybara (~> 2.7.0)
+  capybara (~> 2.13.0)
   coffee-rails
   dalli (>= 2.2.1)
   delayed_job
diff --git a/actionpack/lib/action_dispatch/system_test_case.rb b/actionpack/lib/action_dispatch/system_test_case.rb
index 1bf47d2556..903dac7a71 100644
--- a/actionpack/lib/action_dispatch/system_test_case.rb
+++ b/actionpack/lib/action_dispatch/system_test_case.rb
@@ -1,4 +1,5 @@
 require "capybara/dsl"
+require "capybara/minitest"
 require "action_controller"
 require "action_dispatch/system_testing/driver"
 require "action_dispatch/system_testing/server"
@@ -80,6 +81,7 @@ module ActionDispatch
   # tests as long as you include the required gems and files.
   class SystemTestCase < IntegrationTest
     include Capybara::DSL
+    include Capybara::Minitest::Assertions
     include SystemTesting::TestHelpers::SetupAndTeardown
     include SystemTesting::TestHelpers::ScreenshotHelper
 
diff --git a/railties/lib/rails/generators/rails/app/templates/Gemfile b/railties/lib/rails/generators/rails/app/templates/Gemfile
index b082d70cba..ab4aa04fff 100644
--- a/railties/lib/rails/generators/rails/app/templates/Gemfile
+++ b/railties/lib/rails/generators/rails/app/templates/Gemfile
@@ -34,7 +34,7 @@ group :development, :test do
   gem 'byebug', platforms: [:mri, :mingw, :x64_mingw]
   <%- unless options.skip_system_test? || options.api? -%>
   # Adds support for Capybara system testing and selenium driver
-  gem 'capybara', '~> 2.7.0'
+  gem 'capybara', '~> 2.13.0'
   gem 'selenium-webdriver'
   <%- end -%>
 end