summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2019-05-03 04:02:16 +0000
committerStan Hu <stanhu@gmail.com>2019-05-03 04:02:16 +0000
commit6f6ba5a9210fd517280de77fe76422a2b1eb6e5a (patch)
tree311848bff1d5a1a4b52c334f27730e090c1ff560 /spec
parent3a36c08bdda3f37848ae5d556cfd74923f8ab63b (diff)
parent0595c6d5cd45fbf34f8779be544df72f83647915 (diff)
downloadgitlab-ce-6f6ba5a9210fd517280de77fe76422a2b1eb6e5a.tar.gz
Merge branch 'sh-whitelist-internal-api' into 'master'
Whitelist query limits for internal API Closes gitlab-ee#11450 See merge request gitlab-org/gitlab-ce!28037
Diffstat (limited to 'spec')
-rw-r--r--spec/requests/api/internal_spec.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/spec/requests/api/internal_spec.rb b/spec/requests/api/internal_spec.rb
index 88c19448373..bae0302f3ff 100644
--- a/spec/requests/api/internal_spec.rb
+++ b/spec/requests/api/internal_spec.rb
@@ -959,7 +959,9 @@ describe API::Internal do
it 'creates a new merge request' do
expect do
- post api('/internal/post_receive'), params: valid_params
+ Sidekiq::Testing.fake! do
+ post api('/internal/post_receive'), params: valid_params
+ end
end.to change { MergeRequest.count }.by(1)
end