diff options
author | micael.bergeron <micaelbergeron@gmail.com> | 2017-11-14 11:48:40 -0500 |
---|---|---|
committer | micael.bergeron <micaelbergeron@gmail.com> | 2017-12-07 09:01:23 -0500 |
commit | 6b3f0fee151283348b44a69342ec1a6738cd2de0 (patch) | |
tree | 98f7483a9b5d98d152e268785460d765f1995d13 /spec/services/system_note_service_spec.rb | |
parent | e35656318a0ef78a3a4b5257298201fbefe4fbfa (diff) | |
download | gitlab-ce-6b3f0fee151283348b44a69342ec1a6738cd2de0.tar.gz |
corrects the url building
Diffstat (limited to 'spec/services/system_note_service_spec.rb')
-rw-r--r-- | spec/services/system_note_service_spec.rb | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/spec/services/system_note_service_spec.rb b/spec/services/system_note_service_spec.rb index a918383ecd2..148f81b6a58 100644 --- a/spec/services/system_note_service_spec.rb +++ b/spec/services/system_note_service_spec.rb @@ -690,11 +690,20 @@ describe SystemNoteService do end describe '.new_commit_summary' do + let(:merge_request) { create(:merge_request, :simple, target_project: project, source_project: project) } + it 'escapes HTML titles' do commit = double(title: '<pre>This is a test</pre>', short_id: '12345678') - escaped = '* 12345678 - <pre>This is a test</pre>' + escaped = '<pre>This is a test</pre>' + + expect(described_class.new_commit_summary(merge_request, [commit])).to all(match(%r[- #{escaped}])) + end + + it 'contains the MR diffs commit url' do + commit = merge_request.commits.last + url = %r[/merge_requests/#{merge_request.iid}/diffs\?commit_id=#{commit.id}] - expect(described_class.new_commit_summary([commit])).to eq([escaped]) + expect(described_class.new_commit_summary(merge_request, [commit])).to all(match(url)) end end |