diff options
author | Felipe Artur <felipefac@gmail.com> | 2017-08-31 15:18:35 -0300 |
---|---|---|
committer | Felipe Artur <felipefac@gmail.com> | 2017-08-31 15:18:35 -0300 |
commit | 02fed9a905b65fb9b2a0d61500b51d44cd24ba28 (patch) | |
tree | 011068f576b9df4f3f50bd3c5bc9e4329308b5e4 /spec/factories | |
parent | 8077b728bc26e9ece8055b8301033238ddbdf3f5 (diff) | |
download | gitlab-ce-02fed9a905b65fb9b2a0d61500b51d44cd24ba28.tar.gz |
Backport specs
Diffstat (limited to 'spec/factories')
-rw-r--r-- | spec/factories/milestones.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/spec/factories/milestones.rb b/spec/factories/milestones.rb index 2f75bf12cd7..b5298b2f969 100644 --- a/spec/factories/milestones.rb +++ b/spec/factories/milestones.rb @@ -7,6 +7,7 @@ FactoryGirl.define do group nil project_id nil group_id nil + parent nil end trait :active do @@ -26,6 +27,9 @@ FactoryGirl.define do milestone.project = evaluator.project elsif evaluator.project_id milestone.project_id = evaluator.project_id + elsif evaluator.parent + id = evaluator.parent.id + evaluator.parent.is_a?(Group) ? board.group_id = id : evaluator.project_id = id else milestone.project = create(:project) end |