Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoregrieff <egrieff@gitlab.com>2019-05-27 11:48:03 +0300
committeregrieff <egrieff@gitlab.com>2019-05-27 11:48:03 +0300
commit96d8f009bc762b94e66fa96e5a38f3e3ee2faeb0 (patch)
treefec12a98a390b74892c8d035b4b461b9cf94e921 /spec/services
parentfd4a86884947866dff7d7165917336d094c8b276 (diff)
parent348d779beab593e0e852f5a4d285ea58db75a048 (diff)
Merge branch 'master' into 57825-moving-an-issue-results-in-broken-image-links-in-comments
Diffstat (limited to 'spec/services')
-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 4d33c6f4094..2420817e1f7 100644
--- a/spec/services/system_note_service_spec.rb
+++ b/spec/services/system_note_service_spec.rb
@@ -132,7 +132,7 @@ describe SystemNoteService do
end
it 'sets the note text' do
- link = "http://localhost/#{project.full_path}/-/tags/#{tag_name}"
+ link = "/#{project.full_path}/-/tags/#{tag_name}"
expect(subject.note).to eq "tagged commit #{noteable.sha} to [`#{tag_name}`](#{link})"
end
@@ -1139,7 +1139,7 @@ describe SystemNoteService do
diff_id = merge_request.merge_request_diff.id
line_code = change_position.line_code(project.repository)
- expect(subject.note).to include(diffs_project_merge_request_url(project, merge_request, diff_id: diff_id, anchor: line_code))
+ expect(subject.note).to include(diffs_project_merge_request_path(project, merge_request, diff_id: diff_id, anchor: line_code))
end
end