diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-04-09 08:24:16 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-04-09 08:24:16 +0000 |
| commit | fb0bb32f25cdda752d340316c52ba9a47b346ade (patch) | |
| tree | 2c5ed7bc9d2c786c12c19c0f612bde204f714a68 | |
| parent | d4cfb7301b5478da3bd4b89c54bfc6d3683d0050 (diff) | |
| parent | 2efa9bed0db0ab32f74b9c540f1bd5deceaecf9a (diff) | |
| download | gitlab-ce-fb0bb32f25cdda752d340316c52ba9a47b346ade.tar.gz | |
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
| -rw-r--r-- | Gemfile | 1 | ||||
| -rw-r--r-- | Gemfile.rails5.lock | 5 |
2 files changed, 6 insertions, 0 deletions
@@ -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' diff --git a/Gemfile.rails5.lock b/Gemfile.rails5.lock index 18bbad88ec3..03fe5f2ed26 100644 --- a/Gemfile.rails5.lock +++ b/Gemfile.rails5.lock @@ -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) |