summaryrefslogtreecommitdiff
path: root/spec/services/issues
diff options
context:
space:
mode:
authorDouwe Maan <douwe@selenight.nl>2016-05-20 16:23:04 -0500
committerDouwe Maan <douwe@selenight.nl>2016-05-20 16:23:04 -0500
commitfc1910ddc5db25e608921f69c3dc28d830e6ea03 (patch)
tree1f82bd43de18fdb6ec1d01801d7d75c08bdf7928 /spec/services/issues
parent63f53730c0483b4c9e6fa9d90413d40a8c74a243 (diff)
parent5341b16fc92425d557a1c62d0329b276170eba73 (diff)
downloadgitlab-ce-fc1910ddc5db25e608921f69c3dc28d830e6ea03.tar.gz
Merge branch 'adambutler/gitlab-ce-feature/support-diff-of-issue-title-rename'
# Conflicts: # app/services/system_note_service.rb
Diffstat (limited to 'spec/services/issues')
-rw-r--r--spec/services/issues/update_service_spec.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/services/issues/update_service_spec.rb b/spec/services/issues/update_service_spec.rb
index 810a1f2d666..be19be17151 100644
--- a/spec/services/issues/update_service_spec.rb
+++ b/spec/services/issues/update_service_spec.rb
@@ -75,10 +75,10 @@ describe Issues::UpdateService, services: true do
end
it 'creates system note about title change' do
- note = find_note('Title changed')
+ note = find_note('Changed title:')
expect(note).not_to be_nil
- expect(note.note).to eq 'Title changed from **Old title** to **New title**'
+ expect(note.note).to eq 'Changed title: **{-Old-} title** → **{+New+} title**'
end
it 'creates system note about confidentiality change' do