diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-17 12:07:33 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-17 12:07:33 +0000 |
| commit | 6b75320f525f841454f1ab162d141d3610f2e77b (patch) | |
| tree | 4971c27759e4fbc18b85e71800c3b9c12346317e /spec/factories | |
| parent | 4226aca420920c1844e8eade4798a2dff188a6fc (diff) | |
| download | gitlab-ce-6b75320f525f841454f1ab162d141d3610f2e77b.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/factories')
| -rw-r--r-- | spec/factories/boards.rb | 8 | ||||
| -rw-r--r-- | spec/factories/milestones.rb | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/spec/factories/boards.rb b/spec/factories/boards.rb index 29cfe8fb295..a201ca94380 100644 --- a/spec/factories/boards.rb +++ b/spec/factories/boards.rb @@ -7,7 +7,7 @@ FactoryBot.define do group { nil } project_id { nil } group_id { nil } - parent { nil } + resource_parent { nil } end after(:build, :stub) do |board, evaluator| @@ -19,9 +19,9 @@ FactoryBot.define do board.project = evaluator.project elsif evaluator.project_id board.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 + elsif evaluator.resource_parent + id = evaluator.resource_parent.id + evaluator.resource_parent.is_a?(Group) ? board.group_id = id : evaluator.project_id = id else board.project = create(:project, :empty_repo) end diff --git a/spec/factories/milestones.rb b/spec/factories/milestones.rb index 75ff925774a..32eee645f6a 100644 --- a/spec/factories/milestones.rb +++ b/spec/factories/milestones.rb @@ -9,7 +9,7 @@ FactoryBot.define do group { nil } project_id { nil } group_id { nil } - parent { nil } + resource_parent { nil } end trait :active do @@ -34,9 +34,9 @@ FactoryBot.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) ? evaluator.group_id = id : evaluator.project_id = id + elsif evaluator.resource_parent + id = evaluator.resource_parent.id + evaluator.resource_parent.is_a?(Group) ? evaluator.group_id = id : evaluator.project_id = id else milestone.project = create(:project) end |