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
561a6e47
Commit
561a6e47
authored
Oct 23, 2020
by
Peter Leitzen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix cop FactoryBot/InlineAssociation for EE resource events
parent
403362ba
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
6 deletions
+4
-6
.rubocop_todo.yml
.rubocop_todo.yml
+0
-2
ee/spec/factories/resource_iteration_event.rb
ee/spec/factories/resource_iteration_event.rb
+2
-2
ee/spec/factories/resource_weight_events.rb
ee/spec/factories/resource_weight_events.rb
+2
-2
No files found.
.rubocop_todo.yml
View file @
561a6e47
...
...
@@ -1265,8 +1265,6 @@ FactoryBot/InlineAssociation:
-
'
ee/spec/factories/geo/event_log.rb'
-
'
ee/spec/factories/groups.rb'
-
'
ee/spec/factories/merge_request_blocks.rb'
-
'
ee/spec/factories/resource_iteration_event.rb'
-
'
ee/spec/factories/resource_weight_events.rb'
-
'
ee/spec/factories/vulnerabilities/feedback.rb'
-
'
spec/factories/atlassian_identities.rb'
-
'
spec/factories/design_management/design_at_version.rb'
...
...
ee/spec/factories/resource_iteration_event.rb
View file @
561a6e47
...
...
@@ -2,10 +2,10 @@
FactoryBot
.
define
do
factory
:resource_iteration_event
do
issue
{
merge_request
.
nil?
?
create
(
:issue
)
:
nil
}
issue
{
merge_request
.
nil?
?
association
(
:issue
)
:
nil
}
merge_request
{
nil
}
iteration
action
{
:add
}
user
{
issue
&
.
author
||
merge_request
&
.
author
||
create
(
:user
)
}
user
{
issue
&
.
author
||
merge_request
&
.
author
||
association
(
:user
)
}
end
end
ee/spec/factories/resource_weight_events.rb
View file @
561a6e47
...
...
@@ -2,7 +2,7 @@
FactoryBot
.
define
do
factory
:resource_weight_event
do
issue
{
create
(
:issue
)
}
user
{
issue
&
.
author
||
create
(
:user
)
}
issue
{
association
(
:issue
)
}
user
{
issue
&
.
author
||
association
(
:user
)
}
end
end
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