Add latest changes from gitlab-org/gitlab@14-1-stable-eev14.1.0-rc42

2 files changed, 7 insertions, 33 deletions

diff --git a/spec/models/packages/package_file_spec.rb b/spec/models/packages/package_file_spec.rb
index 7f2f22c815c..ee0aeb26d50 100644
--- a/spec/models/packages/package_file_spec.rb
+++ b/spec/models/packages/package_file_spec.rb
@@ -5,6 +5,7 @@ RSpec.describe Packages::PackageFile, type: :model do
   let_it_be(:project) { create(:project) }
   let_it_be(:package_file1) { create(:package_file, :xml, file_name: 'FooBar') }
   let_it_be(:package_file2) { create(:package_file, :xml, file_name: 'ThisIsATest') }
+  let_it_be(:package_file3) { create(:package_file, :xml, file_name: 'formatted.zip') }
   let_it_be(:debian_package) { create(:debian_package, project: project) }
 
   describe 'relationships' do
@@ -36,6 +37,12 @@ RSpec.describe Packages::PackageFile, type: :model do
 
       it { is_expected.to match_array([package_file1]) }
     end
+
+    describe '.with_format' do
+      subject { described_class.with_format('zip') }
+
+      it { is_expected.to contain_exactly(package_file3) }
+    end
   end
 
   context 'updating project statistics' do
diff --git a/spec/models/packages/package_spec.rb b/spec/models/packages/package_spec.rb
index b2c1d51e4af..449e30f9fb7 100644
--- a/spec/models/packages/package_spec.rb
+++ b/spec/models/packages/package_spec.rb
@@ -1006,37 +1006,4 @@ RSpec.describe Packages::Package, type: :model do
       it_behaves_like 'not enqueuing a sync worker job'
     end
   end
-
-  context 'destroying a composer package' do
-    let_it_be(:package_name) { 'composer-package-name' }
-    let_it_be(:json) { { 'name' => package_name } }
-    let_it_be(:project) { create(:project, :custom_repo, files: { 'composer.json' => json.to_json } ) }
-
-    let!(:package) { create(:composer_package, :with_metadatum, project: project, name: package_name, version: '1.0.0', json: json) }
-
-    before do
-      Gitlab::Composer::Cache.new(project: project, name: package_name).execute
-      package.composer_metadatum.reload
-    end
-
-    context 'with feature flag disabled' do
-      before do
-        stub_feature_flags(disable_composer_callback: false)
-      end
-
-      it 'schedule the update job' do
-        expect(::Packages::Composer::CacheUpdateWorker).to receive(:perform_async).with(project.id, package_name, package.composer_metadatum.version_cache_sha)
-
-        package.destroy!
-      end
-    end
-
-    context 'with feature flag enabled' do
-      it 'does nothing' do
-        expect(::Packages::Composer::CacheUpdateWorker).not_to receive(:perform_async)
-
-        package.destroy!
-      end
-    end
-  end
 end