Add latest changes from gitlab-org/gitlab@master

2 files changed, 29 insertions, 7 deletions

diff --git a/spec/factories/iterations.rb b/spec/factories/iterations.rb
index 028d5304f13..f6be1d9d752 100644
--- a/spec/factories/iterations.rb
+++ b/spec/factories/iterations.rb
@@ -1,8 +1,14 @@
 # frozen_string_literal: true
 
 FactoryBot.define do
+  sequence(:sequential_date) do |n|
+    n.days.from_now
+  end
+
   factory :iteration do
     title
+    start_date { generate(:sequential_date) }
+    due_date { generate(:sequential_date) }
 
     transient do
       project { nil }
@@ -12,17 +18,22 @@ FactoryBot.define do
       resource_parent { nil }
     end
 
-    trait :active do
-      state { Iteration::STATE_ID_MAP[:active] }
+    trait :upcoming do
+      state_enum { Iteration::STATE_ENUM_MAP[:upcoming] }
+    end
+
+    trait :started do
+      state_enum { Iteration::STATE_ENUM_MAP[:started] }
     end
 
     trait :closed do
-      state { Iteration::STATE_ID_MAP[:closed] }
+      state_enum { Iteration::STATE_ENUM_MAP[:closed] }
     end
 
-    trait :with_dates do
-      start_date { Date.new(2000, 1, 1) }
-      due_date { Date.new(2000, 1, 30) }
+    trait(:skip_future_date_validation) do
+      after(:stub, :build) do |iteration|
+        iteration.skip_future_date_validation = true
+      end
     end
 
     after(:build, :stub) do |iteration, evaluator|
@@ -42,7 +53,8 @@ FactoryBot.define do
       end
     end
 
-    factory :active_iteration, traits: [:active]
+    factory :upcoming_iteration, traits: [:upcoming]
+    factory :started_iteration, traits: [:started]
     factory :closed_iteration, traits: [:closed]
   end
 end
diff --git a/spec/factories/usage_data.rb b/spec/factories/usage_data.rb
index e75d5bd7d18..bdc4ca6fc6e 100644
--- a/spec/factories/usage_data.rb
+++ b/spec/factories/usage_data.rb
@@ -40,6 +40,16 @@ FactoryBot.define do
       create_list(:zoom_meeting, 2, project: projects[0], issue: projects[0].issues[2], issue_status: :removed)
       create(:sentry_issue, issue: projects[0].issues[0])
 
+      # Incident Labeled Issues
+      incident_label_attrs = IncidentManagement::CreateIssueService::INCIDENT_LABEL
+      incident_label = create(:label, project: projects[0], **incident_label_attrs)
+      create(:labeled_issue, project: projects[0], labels: [incident_label])
+      incident_group = create(:group)
+      incident_label_scoped_to_project = create(:label, project: projects[1], **incident_label_attrs)
+      incident_label_scoped_to_group = create(:group_label, group: incident_group, **incident_label_attrs)
+      create(:labeled_issue, project: projects[1], labels: [incident_label_scoped_to_project])
+      create(:labeled_issue, project: projects[1], labels: [incident_label_scoped_to_group])
+
       # Enabled clusters
       gcp_cluster = create(:cluster_provider_gcp, :created).cluster
       create(:cluster_provider_aws, :created)