diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-03-24 18:15:02 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-03-24 18:15:02 +0000 |
| commit | 7bc3851c3276c365434ef23e3785102e5b01705a (patch) | |
| tree | f7dfca44c01f4dc24aa1c1b52fcac7f3ce39248b | |
| parent | ef2df7d848f4b13324ed2202fc17b983f34b154d (diff) | |
| download | gitlab-ce-7bc3851c3276c365434ef23e3785102e5b01705a.tar.gz | |
Add latest changes from gitlab-org/gitlab@14-8-stable-ee
| -rw-r--r-- | spec/factories/ci/job_artifacts.rb | 2 | ||||
| -rw-r--r-- | spec/models/ci/deleted_object_spec.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/spec/factories/ci/job_artifacts.rb b/spec/factories/ci/job_artifacts.rb index e6eec280ed0..77b07c4a404 100644 --- a/spec/factories/ci/job_artifacts.rb +++ b/spec/factories/ci/job_artifacts.rb @@ -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 diff --git a/spec/models/ci/deleted_object_spec.rb b/spec/models/ci/deleted_object_spec.rb index cb8911d5027..a19c1b76708 100644 --- a/spec/models/ci/deleted_object_spec.rb +++ b/spec/models/ci/deleted_object_spec.rb @@ -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 |