Skip to content
Snippets Groups Projects
Commit 6b64cbab authored by Albert Salim's avatar Albert Salim Committed by GitLab Release Tools Bot
Browse files

Merge branch '356478-fix-expired-artifact-factory' into 'master'

Fix failing expired artifact specs

See merge request gitlab-org/gitlab!83362

(cherry picked from commit 5e54d449)

57a6a430 Fix failing expired artifact specs
b13f5368 Fix timestamp precision comparison in test
parent 40d9ea0b
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -7,7 +7,7 @@ FactoryBot.define do
file_format { :zip }
 
trait :expired do
expire_at { Date.yesterday }
expire_at { Time.current.yesterday.change(minute: 9) }
end
 
trait :locked do
Loading
Loading
Loading
Loading
@@ -22,7 +22,7 @@ RSpec.describe Ci::DeletedObject, :aggregate_failures do
expect(deleted_artifact.file_store).to eq(artifact.file_store)
expect(deleted_artifact.store_dir).to eq(artifact.file.store_dir.to_s)
expect(deleted_artifact.file_identifier).to eq(artifact.file_identifier)
expect(deleted_artifact.pick_up_at).to eq(artifact.expire_at)
expect(deleted_artifact.pick_up_at).to be_like_time(artifact.expire_at)
end
end
 
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment