Add latest changes from gitlab-org/gitlab@master

1 files changed, 13 insertions, 5 deletions

diff --git a/spec/factories/pages_deployments.rb b/spec/factories/pages_deployments.rb
index 56aab4fa9f3..d3e2fefb4ae 100644
--- a/spec/factories/pages_deployments.rb
+++ b/spec/factories/pages_deployments.rb
@@ -4,12 +4,20 @@ FactoryBot.define do
   factory :pages_deployment, class: 'PagesDeployment' do
     project
 
-    after(:build) do |deployment, _evaluator|
-      filepath = Rails.root.join("spec/fixtures/pages.zip")
+    transient do
+      filename { nil }
+    end
+
+    trait(:migrated) do
+      filename { PagesDeployment::MIGRATED_FILE_NAME }
+    end
+
+    after(:build) do |deployment, evaluator|
+      file = UploadedFile.new("spec/fixtures/pages.zip", filename: evaluator.filename)
 
-      deployment.file = fixture_file_upload(filepath)
-      deployment.file_sha256 = Digest::SHA256.file(filepath).hexdigest
-      ::Zip::File.open(filepath) do |zip_archive|
+      deployment.file = file
+      deployment.file_sha256 = Digest::SHA256.file(file.path).hexdigest
+      ::Zip::File.open(file.path) do |zip_archive|
         deployment.file_count = zip_archive.count
       end
     end