summaryrefslogtreecommitdiff
path: root/spec/factories
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2016-03-01 12:32:20 +0100
committerRémy Coutable <remy@rymai.me>2016-03-08 16:23:20 +0100
commite632bd26e4b70b100e5c9891b4b2cc7e267080c9 (patch)
tree60bebb20fd06870a3a2a4f1164b7c43571479b17 /spec/factories
parent36730e8e63c0ebe16785f33cb2b740f8d67b2b25 (diff)
downloadgitlab-ce-e632bd26e4b70b100e5c9891b4b2cc7e267080c9.tar.gz
Fixes "iid of max iid" in Issuable sidebar for merged MRfix/13928-wrong-iid-of-max-iid
Fixes #13928
Diffstat (limited to 'spec/factories')
-rw-r--r--spec/factories/merge_requests.rb5
1 files changed, 5 insertions, 0 deletions
diff --git a/spec/factories/merge_requests.rb b/spec/factories/merge_requests.rb
index ca1c636fce4..a9df5fa1d3a 100644
--- a/spec/factories/merge_requests.rb
+++ b/spec/factories/merge_requests.rb
@@ -56,6 +56,10 @@ FactoryGirl.define do
target_branch "feature"
end
+ trait :merged do
+ state :merged
+ end
+
trait :closed do
state :closed
end
@@ -84,6 +88,7 @@ FactoryGirl.define do
merge_user author
end
+ factory :merged_merge_request, traits: [:merged]
factory :closed_merge_request, traits: [:closed]
factory :reopened_merge_request, traits: [:reopened]
factory :merge_request_with_diffs, traits: [:with_diffs]