Add latest changes from gitlab-org/gitlab@master

7 files changed, 16 insertions, 16 deletions

diff --git a/spec/factories/ci/builds.rb b/spec/factories/ci/builds.rb
index ccaf0dd997b..fb3c163dff1 100644
--- a/spec/factories/ci/builds.rb
+++ b/spec/factories/ci/builds.rb
@@ -29,6 +29,7 @@ FactoryBot.define do
     end
 
     pipeline factory: :ci_pipeline
+    project { pipeline.project }
 
     trait :degenerated do
       options { nil }
@@ -220,10 +221,6 @@ FactoryBot.define do
       end
     end
 
-    after(:build) do |build, evaluator|
-      build.project ||= build.pipeline.project
-    end
-
     trait :with_deployment do
       after(:build) do |build, evaluator|
         ##
diff --git a/spec/factories/internal_ids.rb b/spec/factories/internal_ids.rb
index bc6ea41ec06..02baaedb996 100644
--- a/spec/factories/internal_ids.rb
+++ b/spec/factories/internal_ids.rb
@@ -6,4 +6,10 @@ FactoryBot.define do
     usage { :issues }
     last_value { project.issues.maximum(:iid) || 0 }
   end
+
+  trait :has_internal_id do
+    after(:stub) do |record|
+      record.iid ||= generate(:iid)
+    end
+  end
 end
diff --git a/spec/factories/issues.rb b/spec/factories/issues.rb
index 24c12a66599..4d0924a9412 100644
--- a/spec/factories/issues.rb
+++ b/spec/factories/issues.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 FactoryBot.define do
-  factory :issue do
+  factory :issue, traits: [:has_internal_id] do
     title { generate(:title) }
     project
     author { project.creator }
diff --git a/spec/factories/merge_requests.rb b/spec/factories/merge_requests.rb
index 08a8ede61b1..abccd775c8a 100644
--- a/spec/factories/merge_requests.rb
+++ b/spec/factories/merge_requests.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 FactoryBot.define do
-  factory :merge_request do
+  factory :merge_request, traits: [:has_internal_id] do
     title { generate(:title) }
     association :source_project, :repository, factory: :project
     target_project { source_project }
diff --git a/spec/factories/milestones.rb b/spec/factories/milestones.rb
index 32eee645f6a..151d286cc29 100644
--- a/spec/factories/milestones.rb
+++ b/spec/factories/milestones.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 FactoryBot.define do
-  factory :milestone do
+  factory :milestone, traits: [:has_internal_id] do
     title
 
     transient do
diff --git a/spec/factories/notes.rb b/spec/factories/notes.rb
index a15c7625500..fdd1a9a18b2 100644
--- a/spec/factories/notes.rb
+++ b/spec/factories/notes.rb
@@ -40,7 +40,7 @@ FactoryBot.define do
 
     factory :discussion_note_on_personal_snippet, traits: [:on_personal_snippet], class: 'DiscussionNote'
 
-    factory :discussion_note_on_snippet, traits: [:on_snippet], class: 'DiscussionNote'
+    factory :discussion_note_on_project_snippet, traits: [:on_project_snippet], class: 'DiscussionNote'
 
     factory :legacy_diff_note_on_commit, traits: [:on_commit, :legacy_diff_note], class: 'LegacyDiffNote'
 
@@ -120,23 +120,19 @@ FactoryBot.define do
     end
 
     trait :on_issue do
-      noteable { create(:issue, project: project) }
-    end
-
-    trait :on_snippet do
-      noteable { create(:snippet, project: project) }
+      noteable { association(:issue, project: project) }
     end
 
     trait :on_merge_request do
-      noteable { create(:merge_request, source_project: project) }
+      noteable { association(:merge_request, source_project: project) }
     end
 
     trait :on_project_snippet do
-      noteable { create(:project_snippet, project: project) }
+      noteable { association(:project_snippet, project: project) }
     end
 
     trait :on_personal_snippet do
-      noteable { create(:personal_snippet) }
+      noteable { association(:personal_snippet) }
       project { nil }
     end
 
diff --git a/spec/factories/sequences.rb b/spec/factories/sequences.rb
index 17b54d69372..cdc64a8502e 100644
--- a/spec/factories/sequences.rb
+++ b/spec/factories/sequences.rb
@@ -11,4 +11,5 @@ FactoryBot.define do
   sequence(:label_title) { |n| "label#{n}" }
   sequence(:branch) { |n| "my-branch-#{n}" }
   sequence(:past_time) { |n| 4.hours.ago + (2 * n).seconds }
+  sequence(:iid)
 end