From 91ed8ed687ee9edbda0098475e66ad41f886d7a5 Mon Sep 17 00:00:00 2001 From: James Edwards-Jones Date: Wed, 15 Mar 2017 22:29:07 +0000 Subject: Protected tags copy/paste from protected branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Should provide basic CRUD backend for frontend to work from. Doesn’t include frontend, API, or the internal API used from gitlab-shell --- spec/factories/protected_tags.rb | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 spec/factories/protected_tags.rb (limited to 'spec/factories') diff --git a/spec/factories/protected_tags.rb b/spec/factories/protected_tags.rb new file mode 100644 index 00000000000..f0016b37d66 --- /dev/null +++ b/spec/factories/protected_tags.rb @@ -0,0 +1,22 @@ +FactoryGirl.define do + factory :protected_tag do + name + project + + after(:build) do |protected_tag| + protected_tag.push_access_levels.new(access_level: Gitlab::Access::MASTER) + end + + trait :developers_can_push do + after(:create) do |protected_tag| + protected_tag.push_access_levels.first.update!(access_level: Gitlab::Access::DEVELOPER) + end + end + + trait :no_one_can_push do + after(:create) do |protected_tag| + protected_tag.push_access_levels.first.update!(access_level: Gitlab::Access::NO_ACCESS) + end + end + end +end -- cgit v1.2.1 From 07d7d8e65905a39164b63f55eccdcea8f10f5d14 Mon Sep 17 00:00:00 2001 From: James Edwards-Jones Date: Tue, 4 Apr 2017 03:37:22 +0100 Subject: Renamed ProtectedTag push_access_levels to create_access_levels --- spec/factories/protected_tags.rb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'spec/factories') diff --git a/spec/factories/protected_tags.rb b/spec/factories/protected_tags.rb index f0016b37d66..d8e90ae1ee1 100644 --- a/spec/factories/protected_tags.rb +++ b/spec/factories/protected_tags.rb @@ -4,18 +4,18 @@ FactoryGirl.define do project after(:build) do |protected_tag| - protected_tag.push_access_levels.new(access_level: Gitlab::Access::MASTER) + protected_tag.create_access_levels.new(access_level: Gitlab::Access::MASTER) end - trait :developers_can_push do + trait :developers_can_create do after(:create) do |protected_tag| - protected_tag.push_access_levels.first.update!(access_level: Gitlab::Access::DEVELOPER) + protected_tag.create_access_levels.first.update!(access_level: Gitlab::Access::DEVELOPER) end end - trait :no_one_can_push do + trait :no_one_can_create do after(:create) do |protected_tag| - protected_tag.push_access_levels.first.update!(access_level: Gitlab::Access::NO_ACCESS) + protected_tag.create_access_levels.first.update!(access_level: Gitlab::Access::NO_ACCESS) end end end -- cgit v1.2.1 From 4131ed2bd85d3efdfe0e27d47ffc95567dae11af Mon Sep 17 00:00:00 2001 From: Shinya Maeda Date: Fri, 7 Apr 2017 19:17:41 +0900 Subject: before_create :set_project. Now TriggerSchedule saves project from parent --- spec/factories/ci/trigger_schedules.rb | 4 ---- 1 file changed, 4 deletions(-) (limited to 'spec/factories') diff --git a/spec/factories/ci/trigger_schedules.rb b/spec/factories/ci/trigger_schedules.rb index 315bce16995..f20799245e0 100644 --- a/spec/factories/ci/trigger_schedules.rb +++ b/spec/factories/ci/trigger_schedules.rb @@ -4,10 +4,6 @@ FactoryGirl.define do cron '0 1 * * *' cron_timezone Gitlab::Ci::CronParser::VALID_SYNTAX_SAMPLE_TIME_ZONE - after(:build) do |trigger_schedule, evaluator| - trigger_schedule.update!(project: trigger_schedule.trigger.project) - end - trait :nightly do cron '0 1 * * *' cron_timezone Gitlab::Ci::CronParser::VALID_SYNTAX_SAMPLE_TIME_ZONE -- cgit v1.2.1 From 03088552549ed1631bb16c1bf3d0bef3613ec793 Mon Sep 17 00:00:00 2001 From: Kamil Trzcinski Date: Fri, 7 Apr 2017 14:47:29 +0200 Subject: Fix ref reference --- spec/factories/ci/trigger_schedules.rb | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'spec/factories') diff --git a/spec/factories/ci/trigger_schedules.rb b/spec/factories/ci/trigger_schedules.rb index f20799245e0..315bce16995 100644 --- a/spec/factories/ci/trigger_schedules.rb +++ b/spec/factories/ci/trigger_schedules.rb @@ -4,6 +4,10 @@ FactoryGirl.define do cron '0 1 * * *' cron_timezone Gitlab::Ci::CronParser::VALID_SYNTAX_SAMPLE_TIME_ZONE + after(:build) do |trigger_schedule, evaluator| + trigger_schedule.update!(project: trigger_schedule.trigger.project) + end + trait :nightly do cron '0 1 * * *' cron_timezone Gitlab::Ci::CronParser::VALID_SYNTAX_SAMPLE_TIME_ZONE -- cgit v1.2.1 From 21a7aed9a7330382300bc93b8927609e65ee6390 Mon Sep 17 00:00:00 2001 From: Kamil Trzcinski Date: Fri, 7 Apr 2017 16:02:13 +0200 Subject: Update tests to cover trigger schedule --- spec/factories/ci/trigger_schedules.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'spec/factories') diff --git a/spec/factories/ci/trigger_schedules.rb b/spec/factories/ci/trigger_schedules.rb index 315bce16995..2390706fa41 100644 --- a/spec/factories/ci/trigger_schedules.rb +++ b/spec/factories/ci/trigger_schedules.rb @@ -3,9 +3,11 @@ FactoryGirl.define do trigger factory: :ci_trigger_for_trigger_schedule cron '0 1 * * *' cron_timezone Gitlab::Ci::CronParser::VALID_SYNTAX_SAMPLE_TIME_ZONE + ref 'master' + active true after(:build) do |trigger_schedule, evaluator| - trigger_schedule.update!(project: trigger_schedule.trigger.project) + trigger_schedule.project ||= trigger_schedule.trigger.project end trait :nightly do -- cgit v1.2.1