Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
794ac6c5
Commit
794ac6c5
authored
May 03, 2018
by
Dylan Griffith
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Use factory in specs for ProjectCiCdSettings"
This reverts commit
bf790c26
.
parent
0ae30057
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
11 deletions
+7
-11
spec/factories/project_ci_cd_settings.rb
spec/factories/project_ci_cd_settings.rb
+0
-10
spec/factories/projects.rb
spec/factories/projects.rb
+7
-1
No files found.
spec/factories/project_ci_cd_settings.rb
deleted
100644 → 0
View file @
0ae30057
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
spec/factories/projects.rb
View file @
794ac6c5
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment