diff options
author | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2016-04-26 13:52:18 +0200 |
---|---|---|
committer | Robert Speicher <rspeicher@gmail.com> | 2016-05-29 15:03:00 -0400 |
commit | e558edd1ce47c3c056dd95c0eba8fd811ee749c7 (patch) | |
tree | 1033c82beeff30db5e1506ef1f040298a1f3038f /spec/models/note_spec.rb | |
parent | 21d0cddd456c03e776a8b30e4695ede94c400792 (diff) | |
download | gitlab-ce-e558edd1ce47c3c056dd95c0eba8fd811ee749c7.tar.gz |
Update specs to carry out changes in note factory
Diffstat (limited to 'spec/models/note_spec.rb')
-rw-r--r-- | spec/models/note_spec.rb | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/spec/models/note_spec.rb b/spec/models/note_spec.rb index d90b54464cd..20d40c47aa6 100644 --- a/spec/models/note_spec.rb +++ b/spec/models/note_spec.rb @@ -202,12 +202,18 @@ describe Note, models: true do let(:merge_request) { create :merge_request } it "converts aliases to actual name" do - note = create(:note, note: ":+1:", noteable: merge_request) + note = create(:note, note: ":+1:", + noteable: merge_request, + project: merge_request.project) + expect(note.reload.note).to eq("thumbsup") end it "is not an award emoji when comment is on a diff" do - note = create(:note_on_merge_request_diff, note: ":blowfish:", noteable: merge_request, line_code: "11d5d2e667e9da4f7f610f81d86c974b146b13bd_0_2") + note = create(:note_on_merge_request_diff, note: ":blowfish:", + noteable: merge_request, + project: merge_request.project, + line_code: "11d5d2e667e9da4f7f610f81d86c974b146b13bd_0_2") note = note.reload expect(note.note).to eq(":blowfish:") |