Add latest changes from gitlab-org/gitlab@master

1 files changed, 6 insertions, 2 deletions

diff --git a/spec/factories/issues.rb b/spec/factories/issues.rb
index 70f480a3bcb..46910078ee5 100644
--- a/spec/factories/issues.rb
+++ b/spec/factories/issues.rb
@@ -12,7 +12,7 @@ FactoryBot.define do
     end
 
     trait :opened do
-      state { :opened }
+      state_id { Issue.available_states[:opened] }
     end
 
     trait :locked do
@@ -20,10 +20,14 @@ FactoryBot.define do
     end
 
     trait :closed do
-      state { :closed }
+      state_id { Issue.available_states[:closed] }
       closed_at { Time.now }
     end
 
+    after(:build) do |issue, evaluator|
+      issue.state_id = Issue.available_states[evaluator.state]
+    end
+
     factory :closed_issue, traits: [:closed]
     factory :reopened_issue, traits: [:opened]