Add latest changes from gitlab-org/gitlab@14-4-stable-eev14.4.0-rc42

1 files changed, 11 insertions, 1 deletions

diff --git a/spec/factories/dependency_proxy.rb b/spec/factories/dependency_proxy.rb
index c2873ce9b5e..836ee87e4d7 100644
--- a/spec/factories/dependency_proxy.rb
+++ b/spec/factories/dependency_proxy.rb
@@ -6,6 +6,11 @@ FactoryBot.define do
     size { 1234 }
     file { fixture_file_upload('spec/fixtures/dependency_proxy/a3ed95caeb02ffe68cdd9fd84406680ae93d633cb16422d00e8a7c22955b46d4.gz') }
     file_name { 'a3ed95caeb02ffe68cdd9fd84406680ae93d633cb16422d00e8a7c22955b46d4.gz' }
+    status { :default }
+
+    trait :expired do
+      status { :expired }
+    end
   end
 
   factory :dependency_proxy_manifest, class: 'DependencyProxy::Manifest' do
@@ -13,7 +18,12 @@ FactoryBot.define do
     size { 1234 }
     file { fixture_file_upload('spec/fixtures/dependency_proxy/manifest') }
     digest { 'sha256:d0710affa17fad5f466a70159cc458227bd25d4afb39514ef662ead3e6c99515' }
-    file_name { 'alpine:latest.json' }
+    sequence(:file_name) { |n| "alpine:latest#{n}.json" }
     content_type { 'application/vnd.docker.distribution.manifest.v2+json' }
+    status { :default }
+
+    trait :expired do
+      status { :expired }
+    end
   end
 end