From 98a892ef0cec6745b1ff1bebc4edc47f29c7672e Mon Sep 17 00:00:00 2001 From: Meredith Edwards Date: Tue, 11 Jul 2017 11:12:22 -0400 Subject: [PATCH] Use rails-5 branch for shoulda-matchers gem to remove deprecation warning See issue here: https://github.com/thoughtbot/shoulda-matchers/issues/933 See fix here: https://github.com/thoughtbot/shoulda-matchers/pull/943 DEPRECATION WARNING: #tables currently returns both tables and views. This behavior is deprecated and will be changed with Rails 5.1 to only return tables. Use #data_sources instead. --- Gemfile | 2 +- Gemfile.lock | 14 ++++++++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index ec0acf1e3..e51c7f3ea 100644 --- a/Gemfile +++ b/Gemfile @@ -77,7 +77,7 @@ group :test do gem 'poltergeist', require: false gem 'selenium-webdriver', require: false gem 'launchy' - gem 'shoulda-matchers' + gem 'shoulda-matchers', git: 'https://github.com/thoughtbot/shoulda-matchers.git', branch: 'rails-5' gem 'faker' gem 'capybara-screenshot' gem 'database_cleaner' diff --git a/Gemfile.lock b/Gemfile.lock index ab0d7a99a..2d44310a7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,3 +1,11 @@ +GIT + remote: https://github.com/thoughtbot/shoulda-matchers.git + revision: f800d62525a65f9bf001ea984ae4926a92ff5b82 + branch: rails-5 + specs: + shoulda-matchers (3.1.2) + activesupport (>= 4.0.0) + GEM remote: https://rubygems.org/ specs: @@ -320,8 +328,6 @@ GEM websocket (~> 1.0) sentry-raven (2.4.0) faraday (>= 0.7.6, < 1.0) - shoulda-matchers (3.1.1) - activesupport (>= 4.0.0) simple_form (3.4.0) actionpack (> 4, < 5.1) activemodel (> 4, < 5.1) @@ -413,7 +419,7 @@ DEPENDENCIES sass-rails selenium-webdriver sentry-raven - shoulda-matchers + shoulda-matchers! simple_form sqlite3 uglifier @@ -423,4 +429,4 @@ RUBY VERSION ruby 2.3.1p112 BUNDLED WITH - 1.14.2 + 1.14.6