summaryrefslogtreecommitdiff
path: root/Gemfile
diff options
context:
space:
mode:
authorblackst0ne <blackst0ne.ru@gmail.com>2018-04-08 15:55:08 +1100
committerblackst0ne <blackst0ne.ru@gmail.com>2018-04-08 15:55:08 +1100
commit2efa9bed0db0ab32f74b9c540f1bd5deceaecf9a (patch)
tree014f283c462069aba8c49725cb854dff8654ba8c /Gemfile
parentdd552d06f6e39d5e6138a33bd7c1bffb2d3dbb1d (diff)
downloadgitlab-ce-2efa9bed0db0ab32f74b9c540f1bd5deceaecf9a.tar.gz
[Rails5] Add `rails-controller-testing` gemblackst0ne-rails5-add-rails-controller-testing-gem
In Rails 5.0 `assert_template` and `assigns()` have been extracted to the `rails-controller-testing` gem. https://github.com/rails/rails/pull/20138/files This commit adds this gem for rails5.
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile1
1 files changed, 1 insertions, 0 deletions
diff --git a/Gemfile b/Gemfile
index d85ee988644..7f5b1f1d3ef 100644
--- a/Gemfile
+++ b/Gemfile
@@ -384,6 +384,7 @@ group :test do
gem 'email_spec', '~> 1.6.0'
gem 'json-schema', '~> 2.8.0'
gem 'webmock', '~> 2.3.2'
+ gem 'rails-controller-testing' if rails5? # Rails5 only gem.
gem 'test_after_commit', '~> 1.1' unless rails5? # Remove this gem when migrated to rails 5.0. It's been integrated to rails 5.0.
gem 'sham_rack', '~> 1.3.6'
gem 'concurrent-ruby', '~> 1.0.5'