diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-01-25 17:50:09 +0000 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-01-25 17:50:09 +0000 |
| commit | 6cfe60df2275dace9804f4bc37b9746a9eadc6fd (patch) | |
| tree | 05e401f44722603121eb196d3097879b98e0aa0c /spec/factories | |
| parent | b55c1bc4b5fb8d259ba9f264eff607f81012fa39 (diff) | |
| parent | b368447cf7fbd090704e22311dde72cd293d9779 (diff) | |
| download | gitlab-ce-6cfe60df2275dace9804f4bc37b9746a9eadc6fd.tar.gz | |
Merge branch 'backport-ee-changes-for-build-minutes' into 'master'
Backport changes introduced by https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/1078
See merge request !8657
Diffstat (limited to 'spec/factories')
| -rw-r--r-- | spec/factories/ci/runners.rb | 4 | ||||
| -rw-r--r-- | spec/factories/groups.rb | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/spec/factories/ci/runners.rb b/spec/factories/ci/runners.rb index ed4acca23f1..c3b4aff55ba 100644 --- a/spec/factories/ci/runners.rb +++ b/spec/factories/ci/runners.rb @@ -16,6 +16,10 @@ FactoryGirl.define do is_shared true end + trait :specific do + is_shared false + end + trait :inactive do active false end diff --git a/spec/factories/groups.rb b/spec/factories/groups.rb index ece6beb9fa9..86f51ffca99 100644 --- a/spec/factories/groups.rb +++ b/spec/factories/groups.rb @@ -1,8 +1,9 @@ FactoryGirl.define do - factory :group do + factory :group, class: Group, parent: :namespace do sequence(:name) { |n| "group#{n}" } path { name.downcase.gsub(/\s/, '_') } type 'Group' + owner nil trait :public do visibility_level Gitlab::VisibilityLevel::PUBLIC |