Do not override foreign attributes in note factory
This commit is contained in:
parent
0e613db76d
commit
21d0cddd45
|
@ -34,7 +34,7 @@ class Note < ActiveRecord::Base
|
||||||
validates :author, presence: true
|
validates :author, presence: true
|
||||||
|
|
||||||
validate unless: :for_commit? do |note|
|
validate unless: :for_commit? do |note|
|
||||||
unless note.noteable.try(:project) == project
|
unless note.noteable.try(:project) == note.project
|
||||||
errors.add(:invalid_project, 'Note and noteable project mismatch')
|
errors.add(:invalid_project, 'Note and noteable project mismatch')
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -4,10 +4,10 @@ include ActionDispatch::TestProcess
|
||||||
|
|
||||||
FactoryGirl.define do
|
FactoryGirl.define do
|
||||||
factory :note do
|
factory :note do
|
||||||
|
project
|
||||||
note "Note"
|
note "Note"
|
||||||
author
|
author
|
||||||
noteable { create(:issue) }
|
noteable { create(:issue, project: project) }
|
||||||
project { noteable.project }
|
|
||||||
|
|
||||||
factory :note_on_issue, aliases: [:votable_note]
|
factory :note_on_issue, aliases: [:votable_note]
|
||||||
factory :note_on_commit, traits: [:on_commit]
|
factory :note_on_commit, traits: [:on_commit]
|
||||||
|
@ -20,7 +20,6 @@ FactoryGirl.define do
|
||||||
factory :upvote_note, traits: [:award, :upvote]
|
factory :upvote_note, traits: [:award, :upvote]
|
||||||
|
|
||||||
trait :on_commit do
|
trait :on_commit do
|
||||||
project
|
|
||||||
noteable nil
|
noteable nil
|
||||||
commit_id RepoHelpers.sample_commit.id
|
commit_id RepoHelpers.sample_commit.id
|
||||||
noteable_type "Commit"
|
noteable_type "Commit"
|
||||||
|
@ -31,11 +30,11 @@ FactoryGirl.define do
|
||||||
end
|
end
|
||||||
|
|
||||||
trait :on_merge_request do
|
trait :on_merge_request do
|
||||||
noteable { create(:merge_request) }
|
noteable { create(:merge_request, project: project) }
|
||||||
end
|
end
|
||||||
|
|
||||||
trait :on_project_snippet do
|
trait :on_project_snippet do
|
||||||
noteable { create(:snippet) }
|
noteable { create(:snippet, project: project) }
|
||||||
end
|
end
|
||||||
|
|
||||||
trait :system do
|
trait :system do
|
||||||
|
|
Loading…
Reference in New Issue