Merge branch 'upgrade-capybara' into 'master'

Bump Capybara gem to 2.6.2 2.6.2 has new selectors, such as `have_current_path`, that may be useful. See merge request !3200

Merge branch 'upgrade-capybara' into 'master'
449e1d4f · Stan Hu · ca3fc229 · 3cc040e1 · 449e1d4f · 449e1d4f
Commit 449e1d4f authored Mar 14, 2016 by Stan Hu
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 3 deletions

CHANGELOG CHANGELOG +1 -0

Gemfile Gemfile +1 -1

Gemfile.lock Gemfile.lock +3 -2

No files found.
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,7 @@ Please view this file on the master branch, on stable branches it's out of date.

 v 8.6.0 (unreleased)
  - Support Golang subpackage fetching (Stan Hu)
+  - Bump Capybara gem to 2.6.2 (Stan Hu)
  - Contributions to forked projects are included in calendar
  - Improve the formatting for the user page bio (Connor Shea)
  - Removed the default password from the initial admin account created during

--- a/Gemfile
+++ b/Gemfile
@@ -273,7 +273,7 @@ group :development, :test do
  # Generate Fake data
  gem 'ffaker', '~> 2.0.0'

-  gem 'capybara',            '~> 2.4.0'
+  gem 'capybara',            '~> 2.6.2'
  gem 'capybara-screenshot', '~> 1.0.0'
  gem 'poltergeist',         '~> 1.9.0'


--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -108,7 +108,8 @@ GEM
      thor (~> 0.18)
    byebug (8.2.1)
    cal-heatmap-rails (3.5.1)
-    capybara (2.4.4)
+    capybara (2.6.2)
+      addressable
      mime-types (>= 1.16)
      nokogiri (>= 1.3.3)
      rack (>= 1.0.0)
@@ -901,7 +902,7 @@ DEPENDENCIES
  bundler-audit
  byebug
  cal-heatmap-rails (~> 3.5.0)
-  capybara (~> 2.4.0)
+  capybara (~> 2.6.2)
  capybara-screenshot (~> 1.0.0)
  carrierwave (~> 0.10.0)
  charlock_holmes (~> 0.7.3)