summaryrefslogtreecommitdiff
path: root/spec/requests/api/internal_spec.rb
diff options
context:
space:
mode:
authorAlex Sanford <alex.sanford1@gmail.com>2017-03-17 12:35:39 +0000
committerSean McGivern <sean@mcgivern.me.uk>2017-03-17 12:35:39 +0000
commit68e3fa0e58938152357c6fb5997f1229666b1d5c (patch)
tree98c68f6cfbfcf925fae1bc3107f610a463bea0da /spec/requests/api/internal_spec.rb
parentd68c23a00e752d347c2439541fe4dddd602ddbcc (diff)
downloadgitlab-ce-68e3fa0e58938152357c6fb5997f1229666b1d5c.tar.gz
Add ability to disable Merge Request URL on push
Diffstat (limited to 'spec/requests/api/internal_spec.rb')
-rw-r--r--spec/requests/api/internal_spec.rb11
1 files changed, 10 insertions, 1 deletions
diff --git a/spec/requests/api/internal_spec.rb b/spec/requests/api/internal_spec.rb
index f18b8e98707..63ec00cdf04 100644
--- a/spec/requests/api/internal_spec.rb
+++ b/spec/requests/api/internal_spec.rb
@@ -397,16 +397,25 @@ describe API::Internal, api: true do
before do
project.team << [user, :developer]
- get api("/internal/merge_request_urls?project=#{repo_name}&changes=#{changes}"), secret_token: secret_token
end
it 'returns link to create new merge request' do
+ get api("/internal/merge_request_urls?project=#{repo_name}&changes=#{changes}"), secret_token: secret_token
+
expect(json_response).to match [{
"branch_name" => "new_branch",
"url" => "http://#{Gitlab.config.gitlab.host}/#{project.namespace.name}/#{project.path}/merge_requests/new?merge_request%5Bsource_branch%5D=new_branch",
"new_merge_request" => true
}]
end
+
+ it 'returns empty array if printing_merge_request_link_enabled is false' do
+ project.update!(printing_merge_request_link_enabled: false)
+
+ get api("/internal/merge_request_urls?project=#{repo_name}&changes=#{changes}"), secret_token: secret_token
+
+ expect(json_response).to eq([])
+ end
end
describe 'POST /notify_post_receive' do