summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-03-04 14:29:57 +0100
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-03-04 14:29:57 +0100
commit954b98377f5e9cdd48bd456d5f49b7f3d0066e5a (patch)
tree3955fc4b51bc31f08e4885fdcd67b58929491fdb /spec
parentd6f26e41dbf06ae9066d2b76147a361e6dee0015 (diff)
parent536d9a938cdfd0c5dc6dc81920cf3c5bb177ebec (diff)
downloadgitlab-ce-954b98377f5e9cdd48bd456d5f49b7f3d0066e5a.tar.gz
Merge remote-tracking branch 'origin/issue_5854'
Diffstat (limited to 'spec')
-rw-r--r--spec/services/system_note_service_spec.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/services/system_note_service_spec.rb b/spec/services/system_note_service_spec.rb
index 1bdc03af12d..5dcc39f5fdc 100644
--- a/spec/services/system_note_service_spec.rb
+++ b/spec/services/system_note_service_spec.rb
@@ -474,8 +474,8 @@ describe SystemNoteService, services: true do
describe "existing reference" do
before do
- message = "[#{author.name}|http://localhost/u/#{author.username}] mentioned this issue in [a commit of #{project.path_with_namespace}|http://localhost/#{project.path_with_namespace}/commit/#{commit.id}]."
- WebMock.stub_request(:get, jira_api_comment_url).to_return(body: "{\"comments\":[{\"body\":\"#{message}\"}]}")
+ message = %Q{[#{author.name}|http://localhost/u/#{author.username}] mentioned this issue in [a commit of #{project.path_with_namespace}|http://localhost/#{project.path_with_namespace}/commit/#{commit.id}]:\\n'#{commit.title}'}
+ WebMock.stub_request(:get, jira_api_comment_url).to_return(body: %Q({"comments":[{"body":"#{message}"}]}))
end
subject { described_class.cross_reference(jira_issue, commit, author) }