From 30aa64202b073e33834241589595a58a14080107 Mon Sep 17 00:00:00 2001 From: Stan Hu Date: Wed, 1 Jun 2016 09:56:06 -0700 Subject: [PATCH] Fix note validation spec failures --- spec/models/commit_range_spec.rb | 5 +++-- spec/models/note_spec.rb | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/spec/models/commit_range_spec.rb b/spec/models/commit_range_spec.rb index 6bc496414a3..384a38ebc69 100644 --- a/spec/models/commit_range_spec.rb +++ b/spec/models/commit_range_spec.rb @@ -151,9 +151,10 @@ describe CommitRange, models: true do issue = create(:issue) create(:note_on_issue, - noteable_id: issue.id, + noteable: issue, system: true, - note: commit1.revert_description) + note: commit1.revert_description, + project: issue.project) expect_any_instance_of(Commit).to receive(:reverts_commit?). with(commit1). diff --git a/spec/models/note_spec.rb b/spec/models/note_spec.rb index b25150f7055..e9d89c9a847 100644 --- a/spec/models/note_spec.rb +++ b/spec/models/note_spec.rb @@ -154,7 +154,7 @@ describe Note, models: true do context "confidential issues" do let(:user) { create :user } let(:confidential_issue) { create(:issue, :confidential, author: user) } - let(:confidential_note) { create :note, note: "Random", noteable: confidential_issue } + let(:confidential_note) { create :note, note: "Random", noteable: confidential_issue, project: confidential_issue.project } it "returns notes with matching content if user can see the issue" do expect(described_class.search(confidential_note.note, as_user: user)).to eq([confidential_note])