kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'fix-note-validation-failure' into 'master'

Browse source 
Fix note validation spec failure

Fix failing build due to project of note not matching issue project.

See merge request !4415
This commit is contained in:
Stan Hu 2016-06-01 18:43:44 +00:00
commit e9bb895b5a
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
spec/models/commit_range_spec.rb
View file

@ -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).

2
spec/models/note_spec.rb
View file

@ -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])