diff options
| author | Valery Sizov <valery@gitlab.com> | 2015-12-24 11:24:03 +0000 |
|---|---|---|
| committer | Valery Sizov <valery@gitlab.com> | 2015-12-24 11:24:03 +0000 |
| commit | e622259d5be95ede9b4f52b0e654cdf0a7a4323f (patch) | |
| tree | 5e9138018dbc3518749af62c729a8da8ea1a6733 /spec | |
| parent | 75c3a2f89b52c7981326693b73b0ad8055a551e8 (diff) | |
| parent | 09c5968fa3f94152b5f2767fded6adbd7ddc7032 (diff) | |
| download | gitlab-ce-e622259d5be95ede9b4f52b0e654cdf0a7a4323f.tar.gz | |
Merge branch 'emoji-picker-fix' into 'master'
Emoji picker: better alias handling
related to https://gitlab.com/gitlab-org/gitlab-ce/issues/3576
See merge request !2198
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/models/note_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/models/note_spec.rb b/spec/models/note_spec.rb index 216c7dabae0..b7006fa5e68 100644 --- a/spec/models/note_spec.rb +++ b/spec/models/note_spec.rb @@ -164,8 +164,8 @@ describe Note, models: true do let(:issue) { create :issue } it "converts aliases to actual name" do - note = create :note, note: ":thumbsup:", noteable: issue - expect(note.reload.note).to eq("+1") + note = create :note, note: ":+1:", noteable: issue + expect(note.reload.note).to eq("thumbsup") end end end |