summaryrefslogtreecommitdiff
path: root/spec/factories/notes.rb
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2017-01-25 14:52:12 -0500
committerRobert Speicher <rspeicher@gmail.com>2017-01-25 14:52:12 -0500
commitc1743ba4c4d838e95bed0d3e74e48a191684c4bf (patch)
tree761bfee8ecda4b6de1f3c42ab049885d2065c25f /spec/factories/notes.rb
parentd0315d5393426bffa6f4e3b84c22d3ef6b0dd54f (diff)
downloadgitlab-ce-c1743ba4c4d838e95bed0d3e74e48a191684c4bf.tar.gz
Use a project factory with a repository where necessaryrs-empty_project-for-associations
Diffstat (limited to 'spec/factories/notes.rb')
-rw-r--r--spec/factories/notes.rb11
1 files changed, 9 insertions, 2 deletions
diff --git a/spec/factories/notes.rb b/spec/factories/notes.rb
index 07474f7e4ba..a750bf23008 100644
--- a/spec/factories/notes.rb
+++ b/spec/factories/notes.rb
@@ -15,10 +15,16 @@ FactoryGirl.define do
factory :note_on_project_snippet, traits: [:on_project_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",
@@ -49,6 +55,7 @@ FactoryGirl.define do
end
trait :on_commit do
+ association :project, :repository
noteable nil
noteable_type 'Commit'
noteable_id nil