diff options
| author | Valery Sizov <vsv2711@gmail.com> | 2015-12-24 12:16:10 +0200 |
|---|---|---|
| committer | Valery Sizov <vsv2711@gmail.com> | 2015-12-24 12:16:10 +0200 |
| commit | e557c8d0a2c1b05148a9d73a8a658962a3ef6147 (patch) | |
| tree | 3f9271476fc4fffa1bd0642f65e5287e5ef8d80d | |
| parent | d4e9c7584466d5275858ad3cf1d401891625aa1a (diff) | |
| parent | 09c5968fa3f94152b5f2767fded6adbd7ddc7032 (diff) | |
| download | gitlab-ce-e557c8d0a2c1b05148a9d73a8a658962a3ef6147.tar.gz | |
Merge branch 'emoji-picker-fix' into emoji-picker-search
| -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 |