Revert "Use factory in specs for ProjectCiCdSettings"

This reverts commit bf790c26c5.
This commit is contained in:
Dylan Griffith 2018-05-03 15:38:55 +02:00
parent 0ae3005781
commit 794ac6c542
2 changed files with 7 additions and 11 deletions

View File

@ -1,10 +0,0 @@
FactoryBot.define do
factory :project_ci_cd_setting do
project
initialize_with do
# ci_cd_settings are automatically created when a project is created
project&.ci_cd_settings || new
end
end
end

View File

@ -14,7 +14,6 @@ FactoryBot.define do
# Associations
namespace
creator { group ? create(:user) : namespace&.owner }
ci_cd_settings strategy: :build, factory: :project_ci_cd_setting, project: nil
transient do
# Nest Project Feature attributes
@ -24,6 +23,10 @@ FactoryBot.define do
issues_access_level ProjectFeature::ENABLED
merge_requests_access_level ProjectFeature::ENABLED
repository_access_level ProjectFeature::ENABLED
# we can't assign the delegated `#ci_cd_settings` attributes directly, as the
# `#ci_cd_settings` relation needs to be created first
group_runners_enabled nil
end
after(:create) do |project, evaluator|
@ -48,6 +51,9 @@ FactoryBot.define do
end
project.group&.refresh_members_authorized_projects
# assign the delegated `#ci_cd_settings` attributes after create
project.reload.group_runners_enabled = evaluator.group_runners_enabled unless evaluator.group_runners_enabled.nil?
end
trait :public do