Add latest changes from gitlab-org/gitlab@master

1 files changed, 11 insertions, 11 deletions

diff --git a/spec/factories/sprints.rb b/spec/factories/iterations.rb
index da0c3c82467..028d5304f13 100644
--- a/spec/factories/sprints.rb
+++ b/spec/factories/iterations.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 FactoryBot.define do
-  factory :sprint do
+  factory :iteration do
     title
 
     transient do
@@ -13,11 +13,11 @@ FactoryBot.define do
     end
 
     trait :active do
-      state { Sprint::STATE_ID_MAP[:active] }
+      state { Iteration::STATE_ID_MAP[:active] }
     end
 
     trait :closed do
-      state { Sprint::STATE_ID_MAP[:closed] }
+      state { Iteration::STATE_ID_MAP[:closed] }
     end
 
     trait :with_dates do
@@ -25,24 +25,24 @@ FactoryBot.define do
       due_date { Date.new(2000, 1, 30) }
     end
 
-    after(:build, :stub) do |sprint, evaluator|
+    after(:build, :stub) do |iteration, evaluator|
       if evaluator.group
-        sprint.group = evaluator.group
+        iteration.group = evaluator.group
       elsif evaluator.group_id
-        sprint.group_id = evaluator.group_id
+        iteration.group_id = evaluator.group_id
       elsif evaluator.project
-        sprint.project = evaluator.project
+        iteration.project = evaluator.project
       elsif evaluator.project_id
-        sprint.project_id = evaluator.project_id
+        iteration.project_id = evaluator.project_id
       elsif evaluator.resource_parent
         id = evaluator.resource_parent.id
         evaluator.resource_parent.is_a?(Group) ? evaluator.group_id = id : evaluator.project_id = id
       else
-        sprint.project = create(:project)
+        iteration.project = create(:project)
       end
     end
 
-    factory :active_sprint, traits: [:active]
-    factory :closed_sprint, traits: [:closed]
+    factory :active_iteration, traits: [:active]
+    factory :closed_iteration, traits: [:closed]
   end
 end