Commit 02ee1271 authored by Markus Koller's avatar Markus Koller

Merge branch 'pl-rubocop-factory-inline-association-core' into 'master'

Fix remaining offenses for FactoryBot/InlineAssociation in Core

See merge request gitlab-org/gitlab!56691
parents 742d0e41 23e0e568
......@@ -41,16 +41,6 @@ Graphql/Descriptions:
- 'ee/app/graphql/types/vulnerability_severity_enum.rb'
- 'ee/app/graphql/types/vulnerability_state_enum.rb'
# WIP See https://gitlab.com/gitlab-org/gitlab/-/issues/267606
FactoryBot/InlineAssociation:
Exclude:
- 'spec/factories/atlassian_identities.rb'
- 'spec/factories/events.rb'
- 'spec/factories/git_wiki_commit_details.rb'
- 'spec/factories/gitaly/commit.rb'
- 'spec/factories/group_group_links.rb'
- 'spec/factories/import_export_uploads.rb'
# WIP: See https://gitlab.com/gitlab-org/gitlab/-/issues/220040
Rails/SaveBang:
Exclude:
......
......@@ -3,7 +3,7 @@
FactoryBot.define do
factory :atlassian_identity, class: 'Atlassian::Identity' do
extern_uid { generate(:username) }
user { create(:user) }
user { association(:user) }
expires_at { 2.weeks.from_now }
token { SecureRandom.alphanumeric(1254) }
refresh_token { SecureRandom.alphanumeric(45) }
......
......@@ -27,17 +27,20 @@ FactoryBot.define do
factory :wiki_page_event do
action { :created }
# rubocop: disable FactoryBot/InlineAssociation
# A persistent project is needed to have a wiki page being created properly.
project { @overrides[:wiki_page]&.container || create(:project, :wiki_repo) }
target { create(:wiki_page_meta, :for_wiki_page, wiki_page: wiki_page) }
# rubocop: enable FactoryBot/InlineAssociation
target { association(:wiki_page_meta, :for_wiki_page, wiki_page: wiki_page) }
transient do
wiki_page { create(:wiki_page, container: project) }
wiki_page { association(:wiki_page, container: project) }
end
end
trait :has_design do
transient do
design { create(:design, issue: create(:issue, project: project)) }
design { association(:design, issue: association(:issue, project: project)) }
end
end
......@@ -45,7 +48,7 @@ FactoryBot.define do
has_design
transient do
note { create(:note, author: author, project: project, noteable: design) }
note { association(:note, author: author, project: project, noteable: design) }
end
action { :commented }
......
......@@ -5,7 +5,7 @@ FactoryBot.define do
skip_create
transient do
author { create(:user) }
author { association(:user) }
end
sequence(:message) { |n| "Commit message #{n}" }
......
......@@ -14,7 +14,7 @@ FactoryBot.define do
subject { "My commit" }
body { subject + "\nMy body" }
author { build(:gitaly_commit_author) }
committer { build(:gitaly_commit_author) }
author { association(:gitaly_commit_author) }
committer { association(:gitaly_commit_author) }
end
end
......@@ -2,8 +2,8 @@
FactoryBot.define do
factory :group_group_link do
shared_group { create(:group) }
shared_with_group { create(:group) }
shared_group { association(:group) }
shared_with_group { association(:group) }
group_access { Gitlab::Access::DEVELOPER }
trait(:guest) { group_access { Gitlab::Access::GUEST } }
......
......@@ -2,6 +2,6 @@
FactoryBot.define do
factory :import_export_upload do
project { create(:project) }
project { association(:project) }
end
end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment