summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLin Jen-Shin <godfat@godfat.org>2019-04-17 07:21:37 +0000
committerLin Jen-Shin <godfat@godfat.org>2019-04-17 07:21:37 +0000
commite574bda61efdfbce6f2a9893d8c9e1df83b6fb2e (patch)
tree5bd6f6354d891b76b3b32b07edd8c052894665ab
parent35d05b1c3671a291c8025e909beaac31e8ac3be5 (diff)
parent37492c5d4439e03f374da487b43ac3e016a93b15 (diff)
downloadgitlab-ce-e574bda61efdfbce6f2a9893d8c9e1df83b6fb2e.tar.gz
Merge branch 'fix-logic-in-43263-git-push-option-to-create-mr-test' into 'master'11-11-auto-deploy-0012345
Fix logic in Api::Internal test See merge request gitlab-org/gitlab-ce!27193
-rw-r--r--spec/requests/api/internal_spec.rb6
1 files changed, 2 insertions, 4 deletions
diff --git a/spec/requests/api/internal_spec.rb b/spec/requests/api/internal_spec.rb
index 1ce8f520962..88c19448373 100644
--- a/spec/requests/api/internal_spec.rb
+++ b/spec/requests/api/internal_spec.rb
@@ -998,15 +998,13 @@ describe API::Internal do
context 'when the feature is disabled' do
it 'does not invoke MergeRequests::PushOptionsHandlerService' do
- Feature.disable(:mr_push_options)
+ stub_feature_flags(mr_push_options: false)
- expect(MergeRequests::PushOptionsHandlerService).to receive(:new)
+ expect(MergeRequests::PushOptionsHandlerService).not_to receive(:new)
expect do
post api('/internal/post_receive'), params: valid_params
end.not_to change { MergeRequest.count }
-
- Feature.enable(:mr_push_options)
end
end
end