Skip to content

Commit

Permalink
Use rails-5 branch for shoulda-matchers gem to remove deprecation war…
Browse files Browse the repository at this point in the history
…ning

See issue here: thoughtbot/shoulda-matchers#933
See fix here: thoughtbot/shoulda-matchers#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.
  • Loading branch information
medwards1771 authored and tjgrathwell committed Jul 19, 2017
1 parent 4c5d35d commit 98a892e
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
14 changes: 10 additions & 4 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -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:
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -413,7 +419,7 @@ DEPENDENCIES
sass-rails
selenium-webdriver
sentry-raven
shoulda-matchers
shoulda-matchers!
simple_form
sqlite3
uglifier
Expand All @@ -423,4 +429,4 @@ RUBY VERSION
ruby 2.3.1p112

BUNDLED WITH
1.14.2
1.14.6

0 comments on commit 98a892e

Please sign in to comment.