diff options
| author | Stan Hu <stanhu@gmail.com> | 2016-06-01 09:56:06 -0700 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2016-06-01 10:31:46 -0700 |
| commit | 30aa64202b073e33834241589595a58a14080107 (patch) | |
| tree | aecc77d60b141fb473f3ceb72aa6f275a958fdc1 | |
| parent | 2d084dd8481417ba8031a378d68009738d076229 (diff) | |
| download | gitlab-ce-30aa64202b073e33834241589595a58a14080107.tar.gz | |
Fix note validation spec failures
| -rw-r--r-- | spec/models/commit_range_spec.rb | 5 | ||||
| -rw-r--r-- | 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]) |