diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-06-15 09:39:30 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-06-15 09:39:30 +0000 |
| commit | b5a14e7404fc794a1959db1e4983ca7421c42791 (patch) | |
| tree | 14feb4ada27b99e7ae051245b6f4ddd55c8e2a38 | |
| parent | 4ac74fe6e809c21e7166157bd326962acd4de14d (diff) | |
| parent | 9203a5abb8188a6d6a4cc2bf3d968fa5f0a99acd (diff) | |
| download | gitlab-ce-b5a14e7404fc794a1959db1e4983ca7421c42791.tar.gz | |
Merge branch 'sh-fix-spec-helper-ee-consistency' into 'master'
Make spec/spec_helper consistent with EE by including a :routing type
See merge request !12178
| -rw-r--r-- | spec/spec_helper.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index a81d3573f8d..01ac3cbd3f6 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -56,6 +56,7 @@ RSpec.configure do |config| config.include StubGitlabCalls config.include StubGitlabData config.include ApiHelpers, :api + config.include Rails.application.routes.url_helpers, type: :routing config.include MigrationsHelpers, :migration config.infer_spec_type_from_file_location! |