diff options
author | Rémy Coutable <remy@rymai.me> | 2017-01-26 09:07:08 +0000 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2017-01-26 09:07:08 +0000 |
commit | 37b4503125c797fbcb7b00f1e73d574dfdfa5816 (patch) | |
tree | 18125a1503810ac8d8f3ab0505fb482eaac20ebf /spec/factories/notes.rb | |
parent | 3a0d9314b187ac406b33ee73d05d4f7b0e316c8b (diff) | |
parent | c1743ba4c4d838e95bed0d3e74e48a191684c4bf (diff) | |
download | gitlab-ce-37b4503125c797fbcb7b00f1e73d574dfdfa5816.tar.gz |
Merge branch 'rs-empty_project-for-associations' into 'master'
Factories with a project association use `:empty_project` by default
See merge request !8770
Diffstat (limited to 'spec/factories/notes.rb')
-rw-r--r-- | spec/factories/notes.rb | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/spec/factories/notes.rb b/spec/factories/notes.rb index 476f2a37793..a21da7074f9 100644 --- a/spec/factories/notes.rb +++ b/spec/factories/notes.rb @@ -4,7 +4,7 @@ include ActionDispatch::TestProcess FactoryGirl.define do factory :note do - project + project factory: :empty_project note "Note" author on_issue @@ -16,10 +16,16 @@ FactoryGirl.define do factory :note_on_personal_snippet, traits: [:on_personal_snippet] factory :system_note, traits: [:system] - factory :legacy_diff_note_on_commit, traits: [:on_commit, :legacy_diff_note], class: LegacyDiffNote - factory :legacy_diff_note_on_merge_request, traits: [:on_merge_request, :legacy_diff_note], class: LegacyDiffNote + factory :legacy_diff_note_on_commit, traits: [:on_commit, :legacy_diff_note], class: LegacyDiffNote do + association :project, :repository + end + + factory :legacy_diff_note_on_merge_request, traits: [:on_merge_request, :legacy_diff_note], class: LegacyDiffNote do + association :project, :repository + end factory :diff_note_on_merge_request, traits: [:on_merge_request], class: DiffNote do + association :project, :repository position do Gitlab::Diff::Position.new( old_path: "files/ruby/popen.rb", @@ -37,6 +43,7 @@ FactoryGirl.define do end factory :diff_note_on_commit, traits: [:on_commit], class: DiffNote do + association :project, :repository position do Gitlab::Diff::Position.new( old_path: "files/ruby/popen.rb", @@ -49,6 +56,7 @@ FactoryGirl.define do end trait :on_commit do + association :project, :repository noteable nil noteable_type 'Commit' noteable_id nil |