Commit 3ec72f51 authored by Nick Thomas's avatar Nick Thomas

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
parents 81c64980 cc4541e1
...@@ -87,6 +87,7 @@ RSpec.configure do |config| ...@@ -87,6 +87,7 @@ RSpec.configure do |config|
config.include LiveDebugger, :js config.include LiveDebugger, :js
config.include MigrationsHelpers, :migration config.include MigrationsHelpers, :migration
config.include RedisHelpers config.include RedisHelpers
config.include Rails.application.routes.url_helpers, type: :routing
if ENV['CI'] if ENV['CI']
# This includes the first try, i.e. tests will be run 4 times before failing. # This includes the first try, i.e. tests will be run 4 times before failing.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment