diff options
author | Sean McGivern <sean@mcgivern.me.uk> | 2017-07-28 18:15:38 +0300 |
---|---|---|
committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-07-28 18:15:38 +0300 |
commit | 883be9c67bdb78bfb695e23cf0b76102d0a358fc (patch) | |
tree | ef8ce3487feed41984785d9238c91eeb1fe5f0ec /spec/factories | |
parent | 58c058c9607a887be74ecc4c5cdc5c0f755341da (diff) | |
parent | 6ef87a20832d1a2581cb85e60eda46f999c55a81 (diff) |
Merge branch 'merge-issuable-reopened-into-opened-state' into 'master'
Merge issuable "reopened" state into "opened"
See merge request !12972
Diffstat (limited to 'spec/factories')
-rw-r--r-- | spec/factories/issues.rb | 6 | ||||
-rw-r--r-- | spec/factories/merge_requests.rb | 6 |
2 files changed, 2 insertions, 10 deletions
diff --git a/spec/factories/issues.rb b/spec/factories/issues.rb index f1fd1fd7f73..a16695cb7c1 100644 --- a/spec/factories/issues.rb +++ b/spec/factories/issues.rb @@ -16,12 +16,8 @@ FactoryGirl.define do state :closed end - trait :reopened do - state :reopened - end - factory :closed_issue, traits: [:closed] - factory :reopened_issue, traits: [:reopened] + factory :reopened_issue, traits: [:opened] factory :labeled_issue do transient do diff --git a/spec/factories/merge_requests.rb b/spec/factories/merge_requests.rb index 253a025af48..1bc530d06db 100644 --- a/spec/factories/merge_requests.rb +++ b/spec/factories/merge_requests.rb @@ -44,10 +44,6 @@ FactoryGirl.define do state :opened end - trait :reopened do - state :reopened - end - trait :locked do state :locked end @@ -74,7 +70,7 @@ FactoryGirl.define do factory :merged_merge_request, traits: [:merged] factory :closed_merge_request, traits: [:closed] - factory :reopened_merge_request, traits: [:reopened] + factory :reopened_merge_request, traits: [:opened] factory :merge_request_with_diffs, traits: [:with_diffs] factory :merge_request_with_diff_notes do after(:create) do |mr| |