From 6f18a8d0b00eae84d262dff137fddd9639f3c52a Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 31 Jan 2023 15:10:47 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- spec/workers/packages/debian/generate_distribution_worker_spec.rb | 3 +-- spec/workers/packages/debian/process_changes_worker_spec.rb | 8 +++++--- spec/workers/packages/debian/process_package_file_worker_spec.rb | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) (limited to 'spec/workers') diff --git a/spec/workers/packages/debian/generate_distribution_worker_spec.rb b/spec/workers/packages/debian/generate_distribution_worker_spec.rb index 390a5e15e66..c4e974ec8eb 100644 --- a/spec/workers/packages/debian/generate_distribution_worker_spec.rb +++ b/spec/workers/packages/debian/generate_distribution_worker_spec.rb @@ -2,8 +2,7 @@ require 'spec_helper' -RSpec.describe Packages::Debian::GenerateDistributionWorker, type: :worker, -feature_category: :package_registry do +RSpec.describe Packages::Debian::GenerateDistributionWorker, type: :worker, feature_category: :package_registry do describe '#perform' do let(:container_type) { distribution.container_type } let(:distribution_id) { distribution.id } diff --git a/spec/workers/packages/debian/process_changes_worker_spec.rb b/spec/workers/packages/debian/process_changes_worker_spec.rb index 9abd022098b..b96b75e93b9 100644 --- a/spec/workers/packages/debian/process_changes_worker_spec.rb +++ b/spec/workers/packages/debian/process_changes_worker_spec.rb @@ -2,12 +2,14 @@ require 'spec_helper' -RSpec.describe Packages::Debian::ProcessChangesWorker, type: :worker do +RSpec.describe Packages::Debian::ProcessChangesWorker, type: :worker, feature_category: :package_registry do let_it_be(:user) { create(:user) } - let_it_be_with_reload(:distribution) { create(:debian_project_distribution, :with_file, codename: 'unstable') } + let_it_be_with_reload(:distribution) do + create(:debian_project_distribution, :with_file, codename: FFaker::Lorem.word, suite: 'unstable') + end let(:incoming) { create(:debian_incoming, project: distribution.project) } - let(:package_file) { incoming.package_files.last } + let(:package_file) { incoming.package_files.with_file_name('sample_1.2.3~alpha2_amd64.changes').first } let(:worker) { described_class.new } describe '#perform' do diff --git a/spec/workers/packages/debian/process_package_file_worker_spec.rb b/spec/workers/packages/debian/process_package_file_worker_spec.rb index f45bc07af0e..239ee8e1035 100644 --- a/spec/workers/packages/debian/process_package_file_worker_spec.rb +++ b/spec/workers/packages/debian/process_package_file_worker_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' RSpec.describe Packages::Debian::ProcessPackageFileWorker, type: :worker, feature_category: :package_registry do - let_it_be_with_reload(:distribution) { create(:debian_project_distribution, :with_file, codename: 'unstable') } + let_it_be_with_reload(:distribution) { create(:debian_project_distribution, :with_file) } let_it_be_with_reload(:package) do create(:debian_package, :processing, project: distribution.project, published_in: nil) end -- cgit v1.2.3