summaryrefslogtreecommitdiff
path: root/spec/spec_helper.rb
diff options
context:
space:
mode:
authorNick Thomas <nick@gitlab.com>2019-07-18 10:47:35 +0000
committerNick Thomas <nick@gitlab.com>2019-07-18 10:47:35 +0000
commit3069cb25451cf9aad4840551b7286fee1c5aebc8 (patch)
tree3f7daffc2fd7adfbebe14a625293e2f005785140 /spec/spec_helper.rb
parent69c113fc8cff7c7646bf252d32b1956b255eaf37 (diff)
parentd4cc92db09a0c765556882943b7508075a0ab0e2 (diff)
downloadgitlab-ce-3069cb25451cf9aad4840551b7286fee1c5aebc8.tar.gz
Merge branch 'webide-commit-use-correct-parent' into 'master'
Use correct parent when committing in WebIDE See merge request gitlab-org/gitlab-ce!29598
Diffstat (limited to 'spec/spec_helper.rb')
-rw-r--r--spec/spec_helper.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 978158192d9..a6fb172e79b 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -104,6 +104,7 @@ RSpec.configure do |config|
config.include Rails.application.routes.url_helpers, type: :routing
config.include PolicyHelpers, type: :policy
config.include MemoryUsageHelper
+ config.include ExpectRequestWithStatus, type: :request
if ENV['CI']
# This includes the first try, i.e. tests will be run 4 times before failing.