Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42

2 files changed, 10 insertions, 0 deletions

diff --git a/spec/factories/analytics/cycle_analytics/project_stages.rb b/spec/factories/analytics/cycle_analytics/project_stages.rb
index 3a481bd20fd..e673c4957b0 100644
--- a/spec/factories/analytics/cycle_analytics/project_stages.rb
+++ b/spec/factories/analytics/cycle_analytics/project_stages.rb
@@ -6,6 +6,7 @@ FactoryBot.define do
     sequence(:name) { |n| "Stage ##{n}" }
     hidden { false }
     issue_stage
+    value_stream { association(:cycle_analytics_project_value_stream, project: project) }
 
     trait :issue_stage do
       start_event_identifier { Gitlab::Analytics::CycleAnalytics::StageEvents::IssueCreated.identifier }
diff --git a/spec/factories/analytics/cycle_analytics/project_value_streams.rb b/spec/factories/analytics/cycle_analytics/project_value_streams.rb
new file mode 100644
index 00000000000..45a6470b0aa
--- /dev/null
+++ b/spec/factories/analytics/cycle_analytics/project_value_streams.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+FactoryBot.define do
+  factory :cycle_analytics_project_value_stream, class: 'Analytics::CycleAnalytics::ProjectValueStream' do
+    sequence(:name) { |n| "Value Stream ##{n}" }
+
+    project
+  end
+end