summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-01-30 09:16:50 +0000
committerRémy Coutable <remy@rymai.me>2017-01-30 09:16:50 +0000
commitfabdcf818b5bfb45edd3a4ffbf1382b4ec9662d2 (patch)
treeb9d5c2ad4424b1cae9ccc2039015b55778e2839d
parentb525aff665f139cd12ac5a6df78d722427e759cc (diff)
parent6c3e59a55e1b695f7ddc05895f7f756b3efa111e (diff)
downloadgitlab-ce-fabdcf818b5bfb45edd3a4ffbf1382b4ec9662d2.tar.gz
Merge branch 'hardcode-title-system-note' into 'master'
Ensure autogenerated title does not cause failing spec Closes #26933 See merge request !8693
-rw-r--r--changelogs/unreleased/hardcode-title-system-note.yml4
-rw-r--r--spec/services/system_note_service_spec.rb4
2 files changed, 7 insertions, 1 deletions
diff --git a/changelogs/unreleased/hardcode-title-system-note.yml b/changelogs/unreleased/hardcode-title-system-note.yml
new file mode 100644
index 00000000000..1b0a63efa51
--- /dev/null
+++ b/changelogs/unreleased/hardcode-title-system-note.yml
@@ -0,0 +1,4 @@
+---
+title: Ensure autogenerated title does not cause failing spec
+merge_request: 8963
+author: brian m. carlson
diff --git a/spec/services/system_note_service_spec.rb b/spec/services/system_note_service_spec.rb
index 9f5a0ac4ec6..bd7269045e1 100644
--- a/spec/services/system_note_service_spec.rb
+++ b/spec/services/system_note_service_spec.rb
@@ -245,6 +245,8 @@ describe SystemNoteService, services: true do
end
describe '.change_title' do
+ let(:noteable) { create(:issue, project: project, title: 'Lorem ipsum') }
+
subject { described_class.change_title(noteable, project, author, 'Old title') }
context 'when noteable responds to `title`' do
@@ -252,7 +254,7 @@ describe SystemNoteService, services: true do
it 'sets the note text' do
expect(subject.note).
- to eq "changed title from **{-Old title-}** to **{+#{noteable.title}+}**"
+ to eq "changed title from **{-Old title-}** to **{+Lorem ipsum+}**"
end
end
end