diff options
author | Felipe Artur <felipefac@gmail.com> | 2016-11-09 19:55:21 -0200 |
---|---|---|
committer | Felipe Artur <felipefac@gmail.com> | 2016-11-18 10:03:31 -0200 |
commit | 85dd05b5b3afb27743998b4f3f9f042b5b5bfa81 (patch) | |
tree | 12dd444fd8c8255566e74b946cbedae9509a8f4c /spec/services/merge_requests/merge_service_spec.rb | |
parent | 18f96e2612b47fbfa0ee9a84614c999b9d24ad54 (diff) | |
download | gitlab-ce-85dd05b5b3afb27743998b4f3f9f042b5b5bfa81.tar.gz |
Add JIRA remotelinks and prevent duplicated closing messages
Diffstat (limited to 'spec/services/merge_requests/merge_service_spec.rb')
-rw-r--r-- | spec/services/merge_requests/merge_service_spec.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/spec/services/merge_requests/merge_service_spec.rb b/spec/services/merge_requests/merge_service_spec.rb index f93d7732a9a..1fd9f5a4910 100644 --- a/spec/services/merge_requests/merge_service_spec.rb +++ b/spec/services/merge_requests/merge_service_spec.rb @@ -67,17 +67,19 @@ describe MergeRequests::MergeService, services: true do it 'closes issues on JIRA issue tracker' do jira_issue = ExternalIssue.new('JIRA-123', project) + stub_jira_urls(jira_issue) commit = double('commit', safe_message: "Fixes #{jira_issue.to_reference}") allow(merge_request).to receive(:commits).and_return([commit]) - expect_any_instance_of(JiraService).to receive(:close_issue).with(merge_request, jira_issue).once + expect_any_instance_of(JiraService).to receive(:close_issue).with(merge_request, an_instance_of(JIRA::Resource::Issue)).once service.execute(merge_request) end context "wrong issue markdown" do it 'does not close issues on JIRA issue tracker' do - jira_issue = ExternalIssue.new('#123', project) + jira_issue = ExternalIssue.new('#JIRA-123', project) + stub_jira_urls(jira_issue) commit = double('commit', safe_message: "Fixes #{jira_issue.to_reference}") allow(merge_request).to receive(:commits).and_return([commit]) |