Commit e574bda6 authored by Lin Jen-Shin's avatar Lin Jen-Shin

Merge branch 'fix-logic-in-43263-git-push-option-to-create-mr-test' into 'master'

Fix logic in Api::Internal test

See merge request gitlab-org/gitlab-ce!27193
parents 35d05b1c 37492c5d
...@@ -998,15 +998,13 @@ describe API::Internal do ...@@ -998,15 +998,13 @@ describe API::Internal do
context 'when the feature is disabled' do context 'when the feature is disabled' do
it 'does not invoke MergeRequests::PushOptionsHandlerService' 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 expect do
post api('/internal/post_receive'), params: valid_params post api('/internal/post_receive'), params: valid_params
end.not_to change { MergeRequest.count } end.not_to change { MergeRequest.count }
Feature.enable(:mr_push_options)
end end
end end
end end
......
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