summaryrefslogtreecommitdiff
path: root/spec/support
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2016-11-18 14:32:32 +0000
committerSean McGivern <sean@mcgivern.me.uk>2016-11-18 14:32:32 +0000
commit64db51b1a8e99f202c606c957036f7abada54f56 (patch)
tree403606fa21d2cf8caadf2550f741547285c43ec1 /spec/support
parent344ece3b2f64fb7283e510d14c9be19d301a2c29 (diff)
parent85dd05b5b3afb27743998b4f3f9f042b5b5bfa81 (diff)
downloadgitlab-ce-64db51b1a8e99f202c606c957036f7abada54f56.tar.gz
Merge branch 'issue_13232' into 'master'
Add JIRA remotelinks and prevent duplicated closing messages implements #13232 closes #20479 See merge request !7413
Diffstat (limited to 'spec/support')
-rw-r--r--spec/support/jira_service_helper.rb5
1 files changed, 5 insertions, 0 deletions
diff --git a/spec/support/jira_service_helper.rb b/spec/support/jira_service_helper.rb
index 96e0dad6b55..7437ba2688d 100644
--- a/spec/support/jira_service_helper.rb
+++ b/spec/support/jira_service_helper.rb
@@ -57,6 +57,10 @@ module JiraServiceHelper
JIRA_API + "/issue/#{issue_id}/comment"
end
+ def jira_api_remote_link_url(issue_id)
+ JIRA_API + "/issue/#{issue_id}/remotelink"
+ end
+
def jira_api_transition_url(issue_id)
JIRA_API + "/issue/#{issue_id}/transitions"
end
@@ -75,6 +79,7 @@ module JiraServiceHelper
WebMock.stub_request(:get, jira_issue_url(issue_id))
WebMock.stub_request(:get, jira_api_test_url)
WebMock.stub_request(:post, jira_api_comment_url(issue_id))
+ WebMock.stub_request(:post, jira_api_remote_link_url(issue_id))
WebMock.stub_request(:post, jira_api_transition_url(issue_id))
end
end