Merge branch 'rs-empty_project-for-associations' into 'master'

features/steps/project/merge_requests/revert.rb

@@ -30,14 +30,13 @@ class Spinach::Features::RevertMergeRequests < Spinach::FeatureSteps
   end
 
   step 'I am signed in as a developer of the project' do
+    @user = create(:user) { |u| @project.add_developer(u) }
     login_as(@user)
   end
 
   step 'There is an open Merge Request' do
-    @user = create(:user)
-    @project = create(:project, :public, :repository)
-    @project_member = create(:project_member, :developer, user: @user, project: @project)
-    @merge_request = create(:merge_request, :with_diffs, :simple, source_project: @project)
+    @merge_request = create(:merge_request, :with_diffs, :simple)
+    @project = @merge_request.source_project
   end
 
   step 'I should see a revert error' do

spec/factories/deploy_keys_projects.rb

 FactoryGirl.define do
   factory :deploy_keys_project do
     deploy_key
-    project
+    project factory: :empty_project
   end
 end

spec/factories/events.rb

 FactoryGirl.define do
   factory :event do
-    project
+    project factory: :empty_project
     author factory: :user
 
     factory :closed_issue_event do

spec/factories/file_uploader.rb

 FactoryGirl.define do
   factory :file_uploader do
-    project
+    project factory: :empty_project
     secret nil
 
     transient do

spec/factories/issues.rb

@@ -6,7 +6,7 @@ FactoryGirl.define do
   factory :issue do
     title
     author
-    project
+    project factory: :empty_project
 
     trait :confidential do
       confidential true

spec/factories/labels.rb

@@ -2,7 +2,7 @@ FactoryGirl.define do
   factory :label, class: ProjectLabel do
     sequence(:title) { |n| "label#{n}" }
     color "#990000"
-    project
+    project factory: :empty_project
 
     transient do
       priority nil

spec/factories/merge_requests.rb

@@ -2,7 +2,7 @@ FactoryGirl.define do
   factory :merge_request do
     title
     author
-    source_project factory: :project
+    association :source_project, :repository, factory: :project
     target_project { source_project }
 
     # $ git log --pretty=oneline feature..master

spec/factories/milestones.rb

 FactoryGirl.define do
   factory :milestone do
     title
-    project
+    project factory: :empty_project
 
     trait :active do
       state "active"

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

spec/factories/project_group_links.rb

 FactoryGirl.define do
   factory :project_group_link do
-    project
+    project factory: :empty_project
     group
   end
 end

spec/factories/project_members.rb

 FactoryGirl.define do
   factory :project_member do
     user
-    project
+    project factory: :empty_project
     master
 
     trait(:guest)     { access_level ProjectMember::GUEST }

spec/factories/project_snippets.rb

 FactoryGirl.define do
   factory :project_snippet, parent: :snippet, class: :ProjectSnippet do
-    project
+    project factory: :empty_project
   end
 end

spec/factories/releases.rb

@@ -2,6 +2,6 @@ FactoryGirl.define do
   factory :release do
     tag "v1.1.0"
     description "Awesome release"
-    project
+    project factory: :empty_project
   end
 end

spec/factories/sent_notifications.rb

 FactoryGirl.define do
   factory :sent_notification do
-    project
+    project factory: :empty_project
     recipient factory: :user
     noteable factory: :issue
     reply_key "0123456789abcdef" * 2

spec/factories/services.rb

 FactoryGirl.define do
   factory :service do
-    project
+    project factory: :empty_project
   end
 end

spec/factories/todos.rb

 FactoryGirl.define do
   factory :todo do
-    project
+    project factory: :empty_project
     author
     user
     target factory: :issue

spec/models/issue_spec.rb

@@ -217,7 +217,7 @@ describe Issue, models: true do
   end
 
   it_behaves_like 'an editable mentionable' do
-    subject { create(:issue) }
+    subject { create(:issue, project: create(:project, :repository)) }
 
     let(:backref_text) { "issue #{subject.to_reference}" }
     let(:set_mentionable_text) { ->(txt){ subject.description = txt } }

spec/models/note_spec.rb

@@ -138,7 +138,7 @@ describe Note, models: true do
   it_behaves_like 'an editable mentionable' do
     subject { create :note, noteable: issue, project: issue.project }
 
-    let(:issue) { create :issue }
+    let(:issue) { create(:issue, project: create(:project, :repository)) }
     let(:backref_text) { issue.gfm_reference }
     let(:set_mentionable_text) { ->(txt) { subject.note = txt } }
   end