diff options
author | Douwe Maan <douwe@selenight.nl> | 2017-03-31 04:33:45 +0300 |
---|---|---|
committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-04-05 19:44:14 +0300 |
commit | bb8cc946689bfafb1e3a65aa00b8e75fb8a5006b (patch) | |
tree | c63719f281b3e38c149ce8a7425d826850914f80 /spec/models/note_spec.rb | |
parent | 2058e71e63c9ac471137f831b4d04b6626968532 (diff) |
Don't use original_discussion_id
Diffstat (limited to 'spec/models/note_spec.rb')
-rw-r--r-- | spec/models/note_spec.rb | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/spec/models/note_spec.rb b/spec/models/note_spec.rb index 67b4fed5f8f..3cdabb2875f 100644 --- a/spec/models/note_spec.rb +++ b/spec/models/note_spec.rb @@ -245,20 +245,6 @@ describe Note, models: true do end end - describe '.find_original_discussion' do - let!(:note) { create(:discussion_note_on_merge_request) } - let!(:note2) { create(:discussion_note_on_merge_request, in_reply_to: note) } - let(:merge_request) { note.noteable } - - it 'returns a discussion with one note' do - discussion = merge_request.notes.find_original_discussion(note.original_discussion_id) - - expect(discussion).not_to be_nil - expect(discussion.notes.count).to be(1) - expect(discussion.first_note.original_discussion_id).to eq(note.original_discussion_id) - end - end - describe '.find_discussion' do let!(:note) { create(:discussion_note_on_merge_request) } let!(:note2) { create(:discussion_note_on_merge_request, in_reply_to: note) } @@ -499,31 +485,6 @@ describe Note, models: true do end end - describe "#original_discussion_id" do - let(:note) { create(:diff_note_on_merge_request) } - - context "when it is newly created" do - it "has a discussion id" do - expect(note.original_discussion_id).not_to be_nil - expect(note.original_discussion_id).to match(/\A\h{40}\z/) - end - end - - context "when it didn't store a discussion id before" do - before do - note.update_column(:original_discussion_id, nil) - end - - it "has a discussion id" do - # The original_discussion_id is set in `after_initialize`, so `reload` won't work - reloaded_note = Note.find(note.id) - - expect(reloaded_note.original_discussion_id).not_to be_nil - expect(reloaded_note.original_discussion_id).to match(/\A\h{40}\z/) - end - end - end - describe '#to_discussion' do subject { create(:discussion_note_on_merge_request) } let!(:note2) { create(:discussion_note_on_merge_request, project: subject.project, noteable: subject.noteable, in_reply_to: subject) } |