Add latest changes from gitlab-org/gitlab@master

22 files changed, 152 insertions, 214 deletions

diff --git a/Gemfile b/Gemfile
index 820a336b66c..010a59a8d4f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -284,17 +284,17 @@ gem 'connection_pool', '~> 2.4' # rubocop:todo Gemfile/MissingFeatureCategory
 gem 'redis-actionpack', '~> 5.3.0' # rubocop:todo Gemfile/MissingFeatureCategory
 
 # Discord integration
-gem 'discordrb-webhooks', '~> 3.4', require: false # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'discordrb-webhooks', '~> 3.4', require: false, feature_category: :integrations
 
 # Jira integration
-gem 'jira-ruby', '~> 2.1.4' # rubocop:todo Gemfile/MissingFeatureCategory
-gem 'atlassian-jwt', '~> 0.2.0' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'jira-ruby', '~> 2.1.4', feature_category: :integrations
+gem 'atlassian-jwt', '~> 0.2.0', feature_category: :integrations
 
 # Slack integration
-gem 'slack-messenger', '~> 2.3.4' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'slack-messenger', '~> 2.3.4', feature_category: :integrations
 
 # FogBugz integration
-gem 'ruby-fogbugz', '~> 0.3.0' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'ruby-fogbugz', '~> 0.3.0', feature_category: :importers
 
 # Kubernetes integration
 gem 'kubeclient', '~> 4.11.0' # rubocop:todo Gemfile/MissingFeatureCategory
diff --git a/qa/qa/factories/deploy_tokens.rb b/qa/qa/factories/deploy_tokens.rb
new file mode 100644
index 00000000000..fb804172177
--- /dev/null
+++ b/qa/qa/factories/deploy_tokens.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module QA
+  FactoryBot.define do
+    # https://docs.gitlab.com/ee/api/deploy_tokens.html#create-a-project-deploy-token
+    factory :project_deploy_token, class: 'QA::Resource::ProjectDeployToken'
+
+    # https://docs.gitlab.com/ee/api/deploy_tokens.html#create-a-group-deploy-token
+    factory :group_deploy_token, class: 'QA::Resource::GroupDeployToken'
+  end
+end
diff --git a/qa/qa/factories/designs.rb b/qa/qa/factories/designs.rb
new file mode 100644
index 00000000000..1475d8c3e0d
--- /dev/null
+++ b/qa/qa/factories/designs.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+module QA
+  FactoryBot.define do
+    factory :design, class: 'QA::Resource::Design'
+  end
+end
diff --git a/qa/qa/factories/packages.rb b/qa/qa/factories/packages.rb
new file mode 100644
index 00000000000..5e4b11e8f8e
--- /dev/null
+++ b/qa/qa/factories/packages.rb
@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module QA
+  FactoryBot.define do
+    # https://docs.gitlab.com/ee/api/packages.html
+    factory :package, class: 'QA::Resource::Package'
+  end
+end
diff --git a/qa/qa/specs/features/api/1_manage/import/import_github_repo_spec.rb b/qa/qa/specs/features/api/1_manage/import/import_github_repo_spec.rb
index 1c335231515..9d0d81bdd91 100644
--- a/qa/qa/specs/features/api/1_manage/import/import_github_repo_spec.rb
+++ b/qa/qa/specs/features/api/1_manage/import/import_github_repo_spec.rb
@@ -136,11 +136,11 @@ module QA
 
         def verify_merge_requests_import
           merge_requests = imported_project.merge_requests
-          merge_request = Resource::MergeRequest.init do |mr|
-            mr.project = imported_project
-            mr.iid = merge_requests.first[:iid]
-            mr.api_client = user_api_client
-          end.reload!
+          merge_request = build(:merge_request,
+            project: imported_project,
+            iid: merge_requests.first[:iid],
+            api_client: user_api_client).reload!
+
           comments, events = fetch_events_and_comments(merge_request)
 
           expect(merge_requests.length).to eq(1)
diff --git a/qa/qa/specs/features/api/1_manage/import/import_large_github_repo_spec.rb b/qa/qa/specs/features/api/1_manage/import/import_large_github_repo_spec.rb
index c56af70ca70..9c02bb39589 100644
--- a/qa/qa/specs/features/api/1_manage/import/import_large_github_repo_spec.rb
+++ b/qa/qa/specs/features/api/1_manage/import/import_large_github_repo_spec.rb
@@ -564,11 +564,7 @@ module QA
 
           logger.debug("- Fetching merge request comments #{api_parallel_threads} parallel threads -")
           Parallel.map(imported_mrs, in_threads: api_parallel_threads) do |mr|
-            resource = Resource::MergeRequest.init do |resource|
-              resource.project = imported_project
-              resource.iid = mr[:iid]
-              resource.api_client = api_client
-            end
+            resource = build(:merge_request, project: imported_project, iid: mr[:iid], api_client: api_client)
 
             comments = resource.comments(**api_request_params)
             label_events = resource.label_events(**api_request_params)
diff --git a/qa/qa/specs/features/api/1_manage/migration/gitlab_migration_issue_spec.rb b/qa/qa/specs/features/api/1_manage/migration/gitlab_migration_issue_spec.rb
index ddf0c39e4c4..04f3bf1cb03 100644
--- a/qa/qa/specs/features/api/1_manage/migration/gitlab_migration_issue_spec.rb
+++ b/qa/qa/specs/features/api/1_manage/migration/gitlab_migration_issue_spec.rb
@@ -74,10 +74,7 @@ module QA
         end
 
         let(:imported_design) do
-          Resource::Design.init do |design|
-            design.api_client = api_client
-            design.issue = imported_issue.reload!
-          end.reload!
+          build(:design, api_client: api_client, issue: imported_issue.reload!).reload!
         end
 
         it(
diff --git a/qa/qa/specs/features/api/1_manage/migration/gitlab_migration_large_project_spec.rb b/qa/qa/specs/features/api/1_manage/migration/gitlab_migration_large_project_spec.rb
index da88cb22011..2fe3857cbe6 100644
--- a/qa/qa/specs/features/api/1_manage/migration/gitlab_migration_large_project_spec.rb
+++ b/qa/qa/specs/features/api/1_manage/migration/gitlab_migration_large_project_spec.rb
@@ -343,11 +343,7 @@ module QA
         imported_mrs = project.merge_requests(auto_paginate: true, attempts: 2)
 
         Parallel.map(imported_mrs, in_threads: api_parallel_threads) do |mr|
-          resource = Resource::MergeRequest.init do |resource|
-            resource.project = project
-            resource.iid = mr[:iid]
-            resource.api_client = client
-          end
+          resource = build(:merge_request, project: project, idd: mr[:iid], api_client: client)
 
           [mr[:iid], {
             url: mr[:web_url],
diff --git a/qa/qa/specs/features/api/1_manage/migration/gitlab_migration_mr_spec.rb b/qa/qa/specs/features/api/1_manage/migration/gitlab_migration_mr_spec.rb
index 6469e7ab92b..a32da1f5880 100644
--- a/qa/qa/specs/features/api/1_manage/migration/gitlab_migration_mr_spec.rb
+++ b/qa/qa/specs/features/api/1_manage/migration/gitlab_migration_mr_spec.rb
@@ -37,11 +37,10 @@ module QA
 
       let(:imported_mrs) { imported_project.merge_requests }
       let(:imported_mr) do
-        Resource::MergeRequest.init do |mr|
-          mr.project = imported_project
-          mr.iid = imported_project.merge_requests.first[:iid]
-          mr.api_client = api_client
-        end
+        build(:merge_request,
+          project: imported_project,
+          iid: imported_project.merge_requests.first[:iid],
+          api_client: api_client)
       end
 
       let(:imported_mr_comments) do
diff --git a/qa/qa/specs/features/browser_ui/3_create/repository/push_http_private_token_spec.rb b/qa/qa/specs/features/browser_ui/3_create/repository/push_http_private_token_spec.rb
index 41ef38d2d66..0fce6d5bcf4 100644
--- a/qa/qa/specs/features/browser_ui/3_create/repository/push_http_private_token_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/repository/push_http_private_token_spec.rb
@@ -9,10 +9,7 @@ module QA
 
         access_token = Resource::PersonalAccessToken.fabricate!.token
 
-        user = Resource::User.init do |user|
-          user.username = Runtime::User.username
-          user.password = access_token
-        end
+        user = build(:user, username: Runtime::User.username, password: access_token)
 
         push = Resource::Repository::ProjectPush.fabricate! do |push|
           push.user = user
diff --git a/qa/qa/specs/features/browser_ui/5_package/package_registry/composer_registry_spec.rb b/qa/qa/specs/features/browser_ui/5_package/package_registry/composer_registry_spec.rb
index 0d6f0faa8c1..a8aa10fc35c 100644
--- a/qa/qa/specs/features/browser_ui/5_package/package_registry/composer_registry_spec.rb
+++ b/qa/qa/specs/features/browser_ui/5_package/package_registry/composer_registry_spec.rb
@@ -5,21 +5,15 @@ module QA
     describe 'Composer Repository', :external_api_calls do
       include Runtime::Fixtures
 
-      let(:project) { create(:project, :privtae, name: 'composer-package-project') }
-      let(:package) do
-        Resource::Package.init do |package|
-          package.name = "my_package-#{SecureRandom.hex(4)}"
-          package.project = project
-        end
-      end
+      let(:project) { create(:project, :private, name: 'composer-package-project') }
+      let(:package) { build(:package, name: "my_package-#{SecureRandom.hex(4)}", project: project) }
 
       let!(:runner) do
-        Resource::ProjectRunner.fabricate! do |runner|
-          runner.name = "qa-runner-#{Time.now.to_i}"
-          runner.tags = ["runner-for-#{project.name}"]
-          runner.executor = :docker
-          runner.project = project
-        end
+        create(:project_runner,
+          name: "qa-runner-#{Time.now.to_i}",
+          tags: ["runner-for-#{project.name}"],
+          executor: :docker,
+          project: project)
       end
 
       let(:gitlab_host_with_port) { Support::GitlabAddress.host_with_port }
diff --git a/qa/qa/specs/features/browser_ui/5_package/package_registry/conan_repository_spec.rb b/qa/qa/specs/features/browser_ui/5_package/package_registry/conan_repository_spec.rb
index 7e70d73e339..7c9c3869fdf 100644
--- a/qa/qa/specs/features/browser_ui/5_package/package_registry/conan_repository_spec.rb
+++ b/qa/qa/specs/features/browser_ui/5_package/package_registry/conan_repository_spec.rb
@@ -10,20 +10,14 @@ module QA
       include Runtime::Fixtures
 
       let(:project) { create(:project, :private, name: 'conan-package-project') }
-      let(:package) do
-        Resource::Package.init do |package|
-          package.name = "conantest-#{SecureRandom.hex(8)}"
-          package.project = project
-        end
-      end
+      let(:package) { build(:package, name: "conantest-#{SecureRandom.hex(8)}", project: project) }
 
       let!(:runner) do
-        Resource::ProjectRunner.fabricate! do |runner|
-          runner.name = "qa-runner-#{Time.now.to_i}"
-          runner.tags = ["runner-for-#{project.name}"]
-          runner.executor = :docker
-          runner.project = project
-        end
+        create(:project_runner,
+          name: "qa-runner-#{Time.now.to_i}",
+          tags: ["runner-for-#{project.name}"],
+          executor: :docker,
+          project: project)
       end
 
       let(:gitlab_address_with_port) do
diff --git a/qa/qa/specs/features/browser_ui/5_package/package_registry/generic_repository_spec.rb b/qa/qa/specs/features/browser_ui/5_package/package_registry/generic_repository_spec.rb
index 1baa70a2a65..2163d73614d 100644
--- a/qa/qa/specs/features/browser_ui/5_package/package_registry/generic_repository_spec.rb
+++ b/qa/qa/specs/features/browser_ui/5_package/package_registry/generic_repository_spec.rb
@@ -6,20 +6,14 @@ module QA
       include Runtime::Fixtures
 
       let(:project) { create(:project, :private, name: 'generic-package-project') }
-      let(:package) do
-        Resource::Package.init do |package|
-          package.name = "my_package-#{SecureRandom.hex(8)}"
-          package.project = project
-        end
-      end
+      let(:package) { build(:package, name: "my_package-#{SecureRandom.hex(8)}", project: project) }
 
       let!(:runner) do
-        Resource::ProjectRunner.fabricate! do |runner|
-          runner.name = "qa-runner-#{Time.now.to_i}"
-          runner.tags = ["runner-for-#{project.name}"]
-          runner.executor = :docker
-          runner.project = project
-        end
+        create(:project_runner,
+          name: "qa-runner-#{Time.now.to_i}",
+          tags: ["runner-for-#{project.name}"],
+          executor: :docker,
+          project: project)
       end
 
       let(:file_txt) do
diff --git a/qa/qa/specs/features/browser_ui/5_package/package_registry/maven/maven_project_level_spec.rb b/qa/qa/specs/features/browser_ui/5_package/package_registry/maven/maven_project_level_spec.rb
index 56ea27f8b6c..98a7e03181f 100644
--- a/qa/qa/specs/features/browser_ui/5_package/package_registry/maven/maven_project_level_spec.rb
+++ b/qa/qa/specs/features/browser_ui/5_package/package_registry/maven/maven_project_level_spec.rb
@@ -13,20 +13,14 @@ module QA
       let(:package_type) { 'maven' }
       let(:personal_access_token) { Runtime::Env.personal_access_token }
       let(:package_project) { create(:project, :with_readme, :private, name: "#{package_type}_package_project") }
-      let(:package) do
-        Resource::Package.init do |package|
-          package.name = package_name
-          package.project = package_project
-        end
-      end
+      let(:package) { build(:package, name: package_name, project: package_project) }
 
       let(:runner) do
-        Resource::ProjectRunner.fabricate! do |runner|
-          runner.name = "qa-runner-#{Time.now.to_i}"
-          runner.tags = ["runner-for-#{package_project.name}"]
-          runner.executor = :docker
-          runner.project = package_project
-        end
+        create(:project_runner,
+          name: "qa-runner-#{Time.now.to_i}",
+          tags: ["runner-for-#{package_project.name}"],
+          executor: :docker,
+          project: package_project)
       end
 
       let(:gitlab_address_with_port) do
@@ -34,15 +28,14 @@ module QA
       end
 
       let(:project_deploy_token) do
-        Resource::ProjectDeployToken.fabricate_via_api! do |deploy_token|
-          deploy_token.name = 'package-deploy-token'
-          deploy_token.project = package_project
-          deploy_token.scopes = %w[
+        create(:project_deploy_token,
+          name: 'package-deploy-token',
+          project: package_project,
+          scopes: %w[
             read_repository
             read_package_registry
             write_package_registry
-          ]
-        end
+          ])
       end
 
       before do
diff --git a/qa/qa/specs/features/browser_ui/5_package/package_registry/npm/npm_group_level_spec.rb b/qa/qa/specs/features/browser_ui/5_package/package_registry/npm/npm_group_level_spec.rb
index db9d5342ad8..e58622d377c 100644
--- a/qa/qa/specs/features/browser_ui/5_package/package_registry/npm/npm_group_level_spec.rb
+++ b/qa/qa/specs/features/browser_ui/5_package/package_registry/npm/npm_group_level_spec.rb
@@ -16,15 +16,14 @@ module QA
       end
 
       let(:project_deploy_token) do
-        Resource::ProjectDeployToken.fabricate_via_api! do |deploy_token|
-          deploy_token.name = 'npm-deploy-token'
-          deploy_token.project = project
-          deploy_token.scopes = %w[
+        create(:project_deploy_token,
+          name: 'npm-deploy-token',
+          project: project,
+          scopes: %w[
             read_repository
             read_package_registry
             write_package_registry
-          ]
-        end
+          ])
       end
 
       let(:gitlab_address_without_port) { Support::GitlabAddress.address_with_port(with_default_port: false) }
@@ -32,19 +31,15 @@ module QA
       let!(:project) { create(:project, name: 'npm-group-level-publish') }
       let!(:another_project) { create(:project, name: 'npm-group-level-install', group: project.group) }
       let!(:runner) do
-        Resource::GroupRunner.fabricate! do |runner|
-          runner.name = "qa-runner-#{Time.now.to_i}"
-          runner.tags = ["runner-for-#{project.group.name}"]
-          runner.executor = :docker
-          runner.group = project.group
-        end
+        create(:group_runner,
+          name: "qa-runner-#{Time.now.to_i}",
+          tags: ["runner-for-#{project.group.name}"],
+          executor: :docker,
+          group: project.group)
       end
 
       let(:package) do
-        Resource::Package.init do |package|
-          package.name = "@#{registry_scope}/#{project.name}-#{SecureRandom.hex(8)}"
-          package.project = project
-        end
+        build(:package, name: "@#{registry_scope}/#{project.name}-#{SecureRandom.hex(8)}", project: project)
       end
 
       after do
diff --git a/qa/qa/specs/features/browser_ui/5_package/package_registry/npm/npm_instance_level_spec.rb b/qa/qa/specs/features/browser_ui/5_package/package_registry/npm/npm_instance_level_spec.rb
index a3a7a496fcc..c24e37e0d1e 100644
--- a/qa/qa/specs/features/browser_ui/5_package/package_registry/npm/npm_instance_level_spec.rb
+++ b/qa/qa/specs/features/browser_ui/5_package/package_registry/npm/npm_instance_level_spec.rb
@@ -16,15 +16,14 @@ module QA
       end
 
       let(:project_deploy_token) do
-        Resource::ProjectDeployToken.fabricate_via_api! do |deploy_token|
-          deploy_token.name = 'npm-deploy-token'
-          deploy_token.project = project
-          deploy_token.scopes = %w[
+        create(:project_deploy_token,
+          name: 'npm-deploy-token',
+          project: project,
+          scopes: %w[
             read_repository
             read_package_registry
             write_package_registry
-          ]
-        end
+          ])
       end
 
       let(:gitlab_address_without_port) { Support::GitlabAddress.address_with_port(with_default_port: false) }
@@ -32,19 +31,15 @@ module QA
       let!(:project) { create(:project, name: 'npm-instance-level-publish') }
       let!(:another_project) { create(:project, name: 'npm-instance-level-install', group: project.group) }
       let!(:runner) do
-        Resource::GroupRunner.fabricate! do |runner|
-          runner.name = "qa-runner-#{Time.now.to_i}"
-          runner.tags = ["runner-for-#{project.group.name}"]
-          runner.executor = :docker
-          runner.group = project.group
-        end
+        create(:group_runner,
+          name: "qa-runner-#{Time.now.to_i}",
+          tags: ["runner-for-#{project.group.name}"],
+          executor: :docker,
+          group: project.group)
       end
 
       let(:package) do
-        Resource::Package.init do |package|
-          package.name = "@#{registry_scope}/#{project.name}-#{SecureRandom.hex(8)}"
-          package.project = project
-        end
+        build(:package, name: "@#{registry_scope}/#{project.name}-#{SecureRandom.hex(8)}", project: project)
       end
 
       after do
diff --git a/qa/qa/specs/features/browser_ui/5_package/package_registry/npm/npm_project_level_spec.rb b/qa/qa/specs/features/browser_ui/5_package/package_registry/npm/npm_project_level_spec.rb
index b45b3af26ae..cfa6b62cdbe 100644
--- a/qa/qa/specs/features/browser_ui/5_package/package_registry/npm/npm_project_level_spec.rb
+++ b/qa/qa/specs/features/browser_ui/5_package/package_registry/npm/npm_project_level_spec.rb
@@ -16,35 +16,28 @@ module QA
       end
 
       let(:project_deploy_token) do
-        Resource::ProjectDeployToken.fabricate_via_api! do |deploy_token|
-          deploy_token.name = 'npm-deploy-token'
-          deploy_token.project = project
-          deploy_token.scopes = %w[
+        create(:project_deploy_token,
+          name: 'npm-deploy-token',
+          project: project,
+          scopes: %w[
             read_repository
             read_package_registry
             write_package_registry
-          ]
-        end
+          ])
       end
 
       let(:gitlab_address_without_port) { Support::GitlabAddress.address_with_port(with_default_port: false) }
       let(:gitlab_host_without_port) { Support::GitlabAddress.host_with_port(with_default_port: false) }
       let!(:project) { create(:project, :private, name: 'npm-project-level') }
       let!(:runner) do
-        Resource::ProjectRunner.fabricate! do |runner|
-          runner.name = "qa-runner-#{Time.now.to_i}"
-          runner.tags = ["runner-for-#{project.name}"]
-          runner.executor = :docker
-          runner.project = project
-        end
+        create(:project_runner,
+          name: "qa-runner-#{Time.now.to_i}",
+          tags: ["runner-for-#{project.name}"],
+          executor: :docker,
+          project: project)
       end
 
-      let(:package) do
-        Resource::Package.init do |package|
-          package.name = "@#{registry_scope}/mypackage-#{SecureRandom.hex(8)}"
-          package.project = project
-        end
-      end
+      let(:package) { build(:package, name: "@#{registry_scope}/mypackage-#{SecureRandom.hex(8)}", project: project) }
 
       after do
         package.remove_via_api!
diff --git a/qa/qa/specs/features/browser_ui/5_package/package_registry/nuget/nuget_group_level_spec.rb b/qa/qa/specs/features/browser_ui/5_package/package_registry/nuget/nuget_group_level_spec.rb
index 4bf020cbb72..a9eadb52c72 100644
--- a/qa/qa/specs/features/browser_ui/5_package/package_registry/nuget/nuget_group_level_spec.rb
+++ b/qa/qa/specs/features/browser_ui/5_package/package_registry/nuget/nuget_group_level_spec.rb
@@ -17,23 +17,17 @@ module QA
       end
 
       let(:group_deploy_token) do
-        Resource::GroupDeployToken.fabricate_via_api! do |deploy_token|
-          deploy_token.name = 'nuget-group-deploy-token'
-          deploy_token.group = project.group
-          deploy_token.scopes = %w[
+        create(:group_deploy_token,
+          name: 'nuget-group-deploy-token',
+          group: project.group,
+          scopes: %w[
             read_repository
             read_package_registry
             write_package_registry
-          ]
-        end
+          ])
       end
 
-      let(:package) do
-        Resource::Package.init do |package|
-          package.name = "dotnetcore-#{SecureRandom.hex(8)}"
-          package.project = project
-        end
-      end
+      let(:package) { build(:package, name: "dotnetcore-#{SecureRandom.hex(8)}", project: project) }
 
       let(:another_project) { create(:project, name: 'nuget-package-install-project', template_name: 'dotnetcore', group: project.group) }
       let(:package_project_inbound_job_token_disabled) do
@@ -51,12 +45,11 @@ module QA
       end
 
       let!(:runner) do
-        Resource::GroupRunner.fabricate! do |runner|
-          runner.name = "qa-runner-#{Time.now.to_i}"
-          runner.tags = ["runner-for-#{project.group.name}"]
-          runner.executor = :docker
-          runner.group = project.group
-        end
+        create(:group_runner,
+          name: "qa-runner-#{Time.now.to_i}",
+          tags: ["runner-for-#{project.group.name}"],
+          executor: :docker,
+          group: project.group)
       end
 
       after do
diff --git a/qa/qa/specs/features/browser_ui/5_package/package_registry/nuget/nuget_project_level_spec.rb b/qa/qa/specs/features/browser_ui/5_package/package_registry/nuget/nuget_project_level_spec.rb
index 15f87e26a07..634d7ab3cd6 100644
--- a/qa/qa/specs/features/browser_ui/5_package/package_registry/nuget/nuget_project_level_spec.rb
+++ b/qa/qa/specs/features/browser_ui/5_package/package_registry/nuget/nuget_project_level_spec.rb
@@ -8,31 +8,24 @@ module QA
       let(:project) { create(:project, :private, name: 'nuget-package-project', template_name: 'dotnetcore') }
       let(:personal_access_token) { Resource::PersonalAccessToken.fabricate! }
       let(:project_deploy_token) do
-        Resource::ProjectDeployToken.fabricate_via_api! do |deploy_token|
-          deploy_token.name = 'package-deploy-token'
-          deploy_token.project = project
-          deploy_token.scopes = %w[
+        create(:project_deploy_token,
+          name: 'package-deploy-token',
+          project: project,
+          scopes: %w[
             read_repository
             read_package_registry
             write_package_registry
-          ]
-        end
+          ])
       end
 
-      let(:package) do
-        Resource::Package.init do |package|
-          package.name = "dotnetcore-#{SecureRandom.hex(8)}"
-          package.project = project
-        end
-      end
+      let(:package) { build(:package, name: "dotnetcore-#{SecureRandom.hex(8)}", project: project) }
 
       let!(:runner) do
-        Resource::ProjectRunner.fabricate! do |runner|
-          runner.name = "qa-runner-#{Time.now.to_i}"
-          runner.tags = ["runner-for-#{project.name}"]
-          runner.executor = :docker
-          runner.project = project
-        end
+        create(:project_runner,
+          name: "qa-runner-#{Time.now.to_i}",
+          tags: ["runner-for-#{project.name}"],
+          executor: :docker,
+          project: project)
       end
 
       after do
diff --git a/qa/qa/specs/features/browser_ui/5_package/package_registry/pypi_repository_spec.rb b/qa/qa/specs/features/browser_ui/5_package/package_registry/pypi_repository_spec.rb
index 4003fd02924..18eaddf2e0d 100644
--- a/qa/qa/specs/features/browser_ui/5_package/package_registry/pypi_repository_spec.rb
+++ b/qa/qa/specs/features/browser_ui/5_package/package_registry/pypi_repository_spec.rb
@@ -7,20 +7,14 @@ module QA
       include Support::Helpers::MaskToken
 
       let(:project) { create(:project, :private, name: 'pypi-package-project') }
-      let(:package) do
-        Resource::Package.init do |package|
-          package.name = "mypypipackage-#{SecureRandom.hex(8)}"
-          package.project = project
-        end
-      end
+      let(:package) { build(:package, name: "mypypipackage-#{SecureRandom.hex(8)}", project: project) }
 
       let!(:runner) do
-        Resource::ProjectRunner.fabricate! do |runner|
-          runner.name = "qa-runner-#{Time.now.to_i}"
-          runner.tags = ["runner-for-#{project.name}"]
-          runner.executor = :docker
-          runner.project = project
-        end
+        create(:project_runner,
+          name: "qa-runner-#{Time.now.to_i}",
+          tags: ["runner-for-#{project.name}"],
+          executor: :docker,
+          project: project)
       end
 
       let(:uri) { URI.parse(Runtime::Scenario.gitlab_address) }
diff --git a/qa/qa/specs/features/browser_ui/5_package/package_registry/rubygems_registry_spec.rb b/qa/qa/specs/features/browser_ui/5_package/package_registry/rubygems_registry_spec.rb
index f58c0175b26..3502022a616 100644
--- a/qa/qa/specs/features/browser_ui/5_package/package_registry/rubygems_registry_spec.rb
+++ b/qa/qa/specs/features/browser_ui/5_package/package_registry/rubygems_registry_spec.rb
@@ -7,20 +7,14 @@ module QA
       include Runtime::Fixtures
 
       let(:project) { create(:project, :private, name: 'rubygems-package-project') }
-      let(:package) do
-        Resource::Package.init do |package|
-          package.name = "mygem-#{SecureRandom.hex(8)}"
-          package.project = project
-        end
-      end
+      let(:package) { build(:package, name: "mygem-#{SecureRandom.hex(8)}", project: project) }
 
       let!(:runner) do
-        Resource::ProjectRunner.fabricate! do |runner|
-          runner.name = "qa-runner-#{Time.now.to_i}"
-          runner.tags = ["runner-for-#{project.name}"]
-          runner.executor = :docker
-          runner.project = project
-        end
+        create(:project_runner,
+          name: "qa-runner-#{Time.now.to_i}",
+          tags: ["runner-for-#{project.name}"],
+          executor: :docker,
+          project: project)
       end
 
       let(:gitlab_address_with_port) do
diff --git a/qa/qa/specs/features/shared_contexts/packages_registry_shared_context.rb b/qa/qa/specs/features/shared_contexts/packages_registry_shared_context.rb
index 21e4d906043..2f7816341f1 100644
--- a/qa/qa/specs/features/shared_contexts/packages_registry_shared_context.rb
+++ b/qa/qa/specs/features/shared_contexts/packages_registry_shared_context.rb
@@ -25,19 +25,15 @@ module QA
     end
 
     let(:package) do
-      Resource::Package.init do |package|
-        package.name = package_name
-        package.project = package_project
-      end
+      build(:package, name: package_name, project: package_project)
     end
 
     let(:runner) do
-      Resource::GroupRunner.fabricate! do |runner|
-        runner.name = "qa-runner-#{Time.now.to_i}"
-        runner.tags = ["runner-for-#{package_project.group.name}"]
-        runner.executor = :docker
-        runner.group = package_project.group
-      end
+      create(:group_runner,
+        name: "qa-runner-#{Time.now.to_i}",
+        tags: ["runner-for-#{package_project.group.name}"],
+        executor: :docker,
+        group: package_project.group)
     end
 
     let(:gitlab_address_with_port) do
@@ -45,15 +41,14 @@ module QA
     end
 
     let(:project_deploy_token) do
-      Resource::ProjectDeployToken.fabricate_via_api! do |deploy_token|
-        deploy_token.name = 'package-deploy-token'
-        deploy_token.project = package_project
-        deploy_token.scopes = %w[
+      create(:project_deploy_token,
+        name: 'package-deploy-token',
+        project: package_project,
+        scopes: %w[
           read_repository
           read_package_registry
           write_package_registry
-        ]
-      end
+        ])
     end
 
     before do