Add latest changes from gitlab-org/gitlab@master

1 files changed, 8 insertions, 4 deletions

diff --git a/spec/factories/merge_requests.rb b/spec/factories/merge_requests.rb
index 28a3f76d485..d16e0c10671 100644
--- a/spec/factories/merge_requests.rb
+++ b/spec/factories/merge_requests.rb
@@ -40,7 +40,7 @@ FactoryBot.define do
     end
 
     trait :merged do
-      state { :merged }
+      state_id { MergeRequest.available_states[:merged] }
     end
 
     trait :merged_target do
@@ -57,7 +57,7 @@ FactoryBot.define do
     end
 
     trait :closed do
-      state { :closed }
+      state_id { MergeRequest.available_states[:closed] }
     end
 
     trait :closed_last_month do
@@ -69,7 +69,7 @@ FactoryBot.define do
     end
 
     trait :opened do
-      state { :opened }
+      state_id { MergeRequest.available_states[:opened] }
     end
 
     trait :invalid do
@@ -78,7 +78,7 @@ FactoryBot.define do
     end
 
     trait :locked do
-      state { :locked }
+      state_id { MergeRequest.available_states[:locked] }
     end
 
     trait :simple do
@@ -186,6 +186,10 @@ FactoryBot.define do
       end
     end
 
+    after(:build) do |merge_request, evaluator|
+      merge_request.state_id = MergeRequest.available_states[evaluator.state]
+    end
+
     after(:create) do |merge_request, evaluator|
       merge_request.cache_merge_request_closes_issues!
     end