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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
7d54eebc
Commit
7d54eebc
authored
Mar 15, 2021
by
Peter Leitzen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix remaining EE offenses for FactoryBot/InlineAssociation
parent
e93aabe1
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
7 deletions
+5
-7
.rubocop_manual_todo.yml
.rubocop_manual_todo.yml
+0
-2
ee/spec/factories/merge_request_blocks.rb
ee/spec/factories/merge_request_blocks.rb
+2
-2
ee/spec/factories/vulnerabilities/feedback.rb
ee/spec/factories/vulnerabilities/feedback.rb
+3
-3
No files found.
.rubocop_manual_todo.yml
View file @
7d54eebc
...
...
@@ -44,8 +44,6 @@ Graphql/Descriptions:
# WIP See https://gitlab.com/gitlab-org/gitlab/-/issues/267606
FactoryBot/InlineAssociation
:
Exclude
:
-
'
ee/spec/factories/merge_request_blocks.rb'
-
'
ee/spec/factories/vulnerabilities/feedback.rb'
-
'
spec/factories/atlassian_identities.rb'
-
'
spec/factories/events.rb'
-
'
spec/factories/git_wiki_commit_details.rb'
...
...
ee/spec/factories/merge_request_blocks.rb
View file @
7d54eebc
...
...
@@ -2,7 +2,7 @@
FactoryBot
.
define
do
factory
:merge_request_block
do
blocking_merge_request
{
create
(
:merge_request
)
}
blocked_merge_request
{
create
(
:merge_request
)
}
blocking_merge_request
{
association
(
:merge_request
)
}
blocked_merge_request
{
association
(
:merge_request
)
}
end
end
ee/spec/factories/vulnerabilities/feedback.rb
View file @
7d54eebc
...
...
@@ -12,7 +12,7 @@ FactoryBot.define do
author
issue
{
nil
}
merge_request
{
nil
}
pipeline
{
create
(
:ci_pipeline
,
project:
project
)
}
pipeline
{
association
(
:ci_pipeline
,
project:
project
)
}
feedback_type
{
'dismissal'
}
category
{
'sast'
}
project_fingerprint
{
generate
(
:project_fingerprint
)
}
...
...
@@ -30,12 +30,12 @@ FactoryBot.define do
trait
:issue
do
feedback_type
{
'issue'
}
issue
{
create
(
:issue
,
project:
project
)
}
issue
{
association
(
:issue
,
project:
project
)
}
end
trait
:merge_request
do
feedback_type
{
'merge_request'
}
merge_request
{
create
(
:merge_request
,
source_project:
project
)
}
merge_request
{
association
(
:merge_request
,
source_project:
project
)
}
end
trait
:sast
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