1 files changed, 4 insertions, 5 deletions
diff --git a/spec/factories/notes.rb b/spec/factories/notes.rb
index 7e9378ab625..cabab0c2207 100644
--- a/spec/factories/notes.rb
+++ b/spec/factories/notes.rb
@@ -4,10 +4,10 @@ include ActionDispatch::TestProcess
 
 FactoryGirl.define do
   factory :note do
+    project
     note "Note"
     author
-    noteable { create(:issue) }
-    project { noteable.project }
+    noteable { create(:issue, project: project) }
 
     factory :note_on_issue,              aliases: [:votable_note]
     factory :note_on_commit,             traits: [:on_commit]
@@ -20,7 +20,6 @@ FactoryGirl.define do
     factory :upvote_note,                traits: [:award, :upvote]
 
     trait :on_commit do
-      project
       noteable nil
       commit_id RepoHelpers.sample_commit.id
       noteable_type "Commit"
@@ -31,11 +30,11 @@ FactoryGirl.define do
     end
 
     trait :on_merge_request do
-      noteable { create(:merge_request) }
+      noteable { create(:merge_request, project: project) }
     end
 
     trait :on_project_snippet do
-      noteable { create(:snippet) }
+      noteable { create(:snippet, project: project) }
     end
 
     trait :system do