diff --git a/.rubocop_manual_todo.yml b/.rubocop_manual_todo.yml index 67dfeebaf7dea00cb214ef494dd4bc0168352720..634c0a2e55c23da7debae265e340bf09a34ad9e0 100644 --- a/.rubocop_manual_todo.yml +++ b/.rubocop_manual_todo.yml @@ -44,7 +44,6 @@ Graphql/Descriptions: # WIP See https://gitlab.com/gitlab-org/gitlab/-/issues/267606 FactoryBot/InlineAssociation: Exclude: - - 'ee/spec/factories/geo/event_log.rb' - 'ee/spec/factories/merge_request_blocks.rb' - 'ee/spec/factories/vulnerabilities/feedback.rb' - 'spec/factories/atlassian_identities.rb' diff --git a/ee/spec/factories/geo/event_log.rb b/ee/spec/factories/geo/event_log.rb index 53f10339b3ed1613cd0c816465180f3ce7e2bcc6..d830cf0fbbb959a559333cf989b4c1ca149df847 100644 --- a/ee/spec/factories/geo/event_log.rb +++ b/ee/spec/factories/geo/event_log.rb @@ -97,37 +97,37 @@ end factory :geo_repository_renamed_event, class: 'Geo::RepositoryRenamedEvent' do - project { create(:project, :repository) } + project { association(:project, :repository) } repository_storage_name { project.repository_storage } old_path_with_namespace { project.path_with_namespace } - new_path_with_namespace { project.path_with_namespace + '_new' } + new_path_with_namespace { "#{project.path_with_namespace}_new" } old_wiki_path_with_namespace { project.wiki.path_with_namespace } - new_wiki_path_with_namespace { project.wiki.path_with_namespace + '_new' } + new_wiki_path_with_namespace { "#{project.wiki.path_with_namespace}_new" } old_path { project.path } - new_path { project.path + '_new' } + new_path { "#{project.path}_new" } end factory :geo_hashed_storage_migrated_event, class: 'Geo::HashedStorageMigratedEvent' do - project { create(:project, :repository) } + project { association(:project, :repository) } repository_storage_name { project.repository_storage } old_disk_path { project.path_with_namespace } - new_disk_path { project.path_with_namespace + '_new' } + new_disk_path { "#{project.path_with_namespace}_new" } old_wiki_disk_path { project.wiki.path_with_namespace } - new_wiki_disk_path { project.wiki.path_with_namespace + '_new' } + new_wiki_disk_path { "#{project.wiki.path_with_namespace}_new" } new_storage_version { Project::HASHED_STORAGE_FEATURES[:repository] } end factory :geo_hashed_storage_attachments_event, class: 'Geo::HashedStorageAttachmentsEvent' do - project { create(:project, :repository) } + project { association(:project, :repository) } old_attachments_path { Storage::LegacyProject.new(project).disk_path } new_attachments_path { Storage::Hashed.new(project).disk_path } end factory :geo_lfs_object_deleted_event, class: 'Geo::LfsObjectDeletedEvent' do - lfs_object { create(:lfs_object, :with_file) } + lfs_object { association(:lfs_object, :with_file) } after(:build, :stub) do |event, _| local_store_path = Pathname.new(LfsObjectUploader.root) @@ -139,7 +139,7 @@ end factory :geo_job_artifact_deleted_event, class: 'Geo::JobArtifactDeletedEvent' do - job_artifact { create(:ci_job_artifact, :archive) } + job_artifact { association(:ci_job_artifact, :archive) } after(:build, :stub) do |event, _| local_store_path = Pathname.new(JobArtifactUploader.root) @@ -150,22 +150,22 @@ end factory :geo_upload_deleted_event, class: 'Geo::UploadDeletedEvent' do - upload { create(:upload) } + upload { association(:upload) } file_path { upload.path } model_id { upload.model_id } model_type { upload.model_type } uploader { upload.uploader } trait :issuable_upload do - upload { create(:upload, :issuable_upload) } + upload { association(:upload, :issuable_upload) } end trait :personal_snippet do - upload { create(:upload, :personal_snippet) } + upload { association(:upload, :personal_snippet) } end trait :namespace_upload do - upload { create(:upload, :namespace_upload) } + upload { association(:upload, :namespace_upload) } end end