diff options
| author | Nick Thomas <nick@gitlab.com> | 2018-06-14 15:04:57 +0000 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2018-06-14 15:04:57 +0000 |
| commit | 3ec72f517a335d962cf5313c29f38e03b40f3b3e (patch) | |
| tree | d86e5e6209de62bc8132c7c493dd6e18c1fd3ea9 | |
| parent | 81c64980af6aead6abe13ba35dc678069fc5c8e8 (diff) | |
| parent | cc4541e1b2bc4a946d34c689464ec88ac7320963 (diff) | |
| download | gitlab-ce-3ec72f517a335d962cf5313c29f38e03b40f3b3e.tar.gz | |
Merge branch 'ce-6420-unify-spec_helper.rb' into 'master'
CE: Resolve "Extract EE specific files/lines for spec/spec_helper.rb"
See merge request gitlab-org/gitlab-ce!19851
| -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 8417b340de5..dac609e2545 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -87,6 +87,7 @@ RSpec.configure do |config| config.include LiveDebugger, :js config.include MigrationsHelpers, :migration config.include RedisHelpers + config.include Rails.application.routes.url_helpers, type: :routing if ENV['CI'] # This includes the first try, i.e. tests will be run 4 times before failing. |