Merge branch 'blackst0ne-rails5-add-rails-controller-testing-gem' into 'master'
[Rails5] Add `rails-controller-testing` gem See merge request gitlab-org/gitlab-ce!18242
This commit is contained in:
commit
fb0bb32f25
2 changed files with 6 additions and 0 deletions
1
Gemfile
1
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'
|
||||
|
|
|
@ -678,6 +678,10 @@ GEM
|
|||
bundler (>= 1.3.0)
|
||||
railties (= 5.0.6)
|
||||
sprockets-rails (>= 2.0.0)
|
||||
rails-controller-testing (1.0.2)
|
||||
actionpack (~> 5.x, >= 5.0.1)
|
||||
actionview (~> 5.x, >= 5.0.1)
|
||||
activesupport (~> 5.x)
|
||||
rails-deprecated_sanitizer (1.0.3)
|
||||
activesupport (>= 4.2.0.alpha)
|
||||
rails-dom-testing (2.0.3)
|
||||
|
@ -1145,6 +1149,7 @@ DEPENDENCIES
|
|||
rack-oauth2 (~> 1.2.1)
|
||||
rack-proxy (~> 0.6.0)
|
||||
rails (= 5.0.6)
|
||||
rails-controller-testing
|
||||
rails-deprecated_sanitizer (~> 1.0.3)
|
||||
rails-i18n (~> 5.1)
|
||||
rainbow (~> 2.2)
|
||||
|
|
Loading…
Reference in a new issue