diff --git a/.rubocop_manual_todo.yml b/.rubocop_manual_todo.yml index ab03f289c25fd666c69033ff605b703baacf7b3a..76e56f3a4a19d72d80909f3b020ec622ba2e7eb1 100644 --- a/.rubocop_manual_todo.yml +++ b/.rubocop_manual_todo.yml @@ -16,8 +16,6 @@ FactoryBot/InlineAssociation: - 'spec/factories/import_export_uploads.rb' - 'spec/factories/merge_requests.rb' - 'spec/factories/notes.rb' - - 'spec/factories/packages.rb' - - 'spec/factories/packages/package_file.rb' - 'spec/factories/sent_notifications.rb' - 'spec/factories/uploads.rb' - 'spec/factories/wiki_pages.rb' diff --git a/spec/factories/packages.rb b/spec/factories/packages.rb index e2c5b0009887cdf4b763e4221d0f3ab6c544760b..e4fadb51d416d6bd49c0a8215dba00ad2bd6dd28 100644 --- a/spec/factories/packages.rb +++ b/spec/factories/packages.rb @@ -129,7 +129,7 @@ end trait(:without_loaded_metadatum) do - conan_metadatum { build(:conan_metadatum, package: nil) } + conan_metadatum { build(:conan_metadatum, package: nil) } # rubocop:disable FactoryBot/InlineAssociation end end @@ -141,7 +141,7 @@ end factory :composer_metadatum, class: 'Packages::Composer::Metadatum' do - package { create(:composer_package) } + package { association(:composer_package) } target_sha { '123' } composer_json { { name: 'foo' } } @@ -166,12 +166,12 @@ end factory :pypi_metadatum, class: 'Packages::Pypi::Metadatum' do - package { create(:pypi_package, without_loaded_metadatum: true) } + package { association(:pypi_package, without_loaded_metadatum: true) } required_python { '>=2.7' } end factory :nuget_metadatum, class: 'Packages::Nuget::Metadatum' do - package { create(:nuget_package) } + package { association(:nuget_package) } license_url { 'http://www.gitlab.com' } project_url { 'http://www.gitlab.com' } @@ -179,7 +179,7 @@ end factory :conan_file_metadatum, class: 'Packages::Conan::FileMetadatum' do - package_file { create(:conan_package_file, :conan_recipe_file, without_loaded_metadatum: true) } + package_file { association(:conan_package_file, :conan_recipe_file, without_loaded_metadatum: true) } recipe_revision { '0' } conan_file_type { 'recipe_file' } @@ -188,7 +188,7 @@ end trait(:package_file) do - package_file { create(:conan_package_file, :conan_package, without_loaded_metadatum: true) } + package_file { association(:conan_package_file, :conan_package, without_loaded_metadatum: true) } conan_file_type { 'package_file' } package_revision { '0' } conan_package_reference { '123456789' } @@ -201,8 +201,8 @@ end factory :packages_dependency_link, class: 'Packages::DependencyLink' do - package { create(:nuget_package) } - dependency { create(:packages_dependency) } + package { association(:nuget_package) } + dependency { association(:packages_dependency) } dependency_type { :dependencies } trait(:with_nuget_metadatum) do @@ -213,7 +213,7 @@ end factory :nuget_dependency_link_metadatum, class: 'Packages::Nuget::DependencyLinkMetadatum' do - dependency_link { create(:packages_dependency_link) } + dependency_link { association(:packages_dependency_link) } target_framework { '.NETStandard2.0' } end diff --git a/spec/factories/packages/package_file.rb b/spec/factories/packages/package_file.rb index bcca48fb086fef6cbd4afefac4b7bc3cf5d447b8..643ab8e4f95e2a316d121389f1f2acb355cdddc3 100644 --- a/spec/factories/packages/package_file.rb +++ b/spec/factories/packages/package_file.rb @@ -15,7 +15,7 @@ end factory :conan_package_file do - package { create(:conan_package, without_package_files: true) } + package { association(:conan_package, without_package_files: true) } transient do without_loaded_metadatum { false }