Add ailiases for artifact migratablerefactor-artifacts-archive

3 files changed, 10 insertions, 9 deletions

diff --git a/app/models/concerns/artifact_migratable.rb b/app/models/concerns/artifact_migratable.rb
index 4e99ae8e68d..ed1d03151ba 100644
--- a/app/models/concerns/artifact_migratable.rb
+++ b/app/models/concerns/artifact_migratable.rb
@@ -7,10 +7,12 @@ module ArtifactMigratable
   def artifacts_archive_file
     job_artifacts_archive&.file || legacy_artifacts_file
   end
+  alias_method :artifacts_file, :artifacts_archive_file
 
   def artifacts_archive_metadata
     job_artifacts_archive_metadata&.file || legacy_artifacts_metadata
   end
+  alias_method :artifacts_metadata, :artifacts_archive_metadata
 
   def artifacts_archive?
     !artifacts_expired? && artifacts_archive_file.exists?
@@ -23,6 +25,7 @@ module ArtifactMigratable
   def artifacts_archive_file_changed?
     job_artifacts_archive&.file_changed? || attribute_changed?(:artifacts_file)
   end
+  alias_method :artifacts_file_changed?, :artifacts_archive_file_changed?
 
   def remove_artifacts_archive_file!
     if job_artifacts_archive
diff --git a/spec/factories/ci/builds.rb b/spec/factories/ci/builds.rb
index 9813190925b..6aeda0ae329 100644
--- a/spec/factories/ci/builds.rb
+++ b/spec/factories/ci/builds.rb
@@ -169,13 +169,11 @@ FactoryBot.define do
     end
 
     trait :legacy_artifacts do
-      after(:create) do |build, _|
-        build.update!(
-          legacy_artifacts_file: fixture_file_upload(
-            Rails.root.join('spec/fixtures/ci_build_artifacts.zip'), 'application/zip'),
-          legacy_artifacts_metadata: fixture_file_upload(
-            Rails.root.join('spec/fixtures/ci_build_artifacts_metadata.gz'), 'application/x-gzip')
-        )
+      after(:build) do |build, _|
+        build.legacy_artifacts_file = fixture_file_upload(
+          Rails.root.join('spec/fixtures/ci_build_artifacts.zip'), 'application/zip')
+        build.legacy_artifacts_metadata = fixture_file_upload(
+          Rails.root.join('spec/fixtures/ci_build_artifacts_metadata.gz'), 'application/x-gzip')
       end
     end
 
diff --git a/spec/models/ci/build_spec.rb b/spec/models/ci/build_spec.rb
index 45fc2e157a0..3a47f17add4 100644
--- a/spec/models/ci/build_spec.rb
+++ b/spec/models/ci/build_spec.rb
@@ -1562,7 +1562,7 @@ describe Ci::Build do
       end
 
       it 'has expiring artifacts' do
-        expect(build).to have_expiring_artifacts
+        expect(build).to have_expiring_artifacts_archive
       end
     end
 
@@ -1572,7 +1572,7 @@ describe Ci::Build do
       end
 
       it 'does not have expiring artifacts' do
-        expect(build).not_to have_expiring_artifacts
+        expect(build).not_to have_expiring_artifacts_archive
       end
     end
   end