diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-18 14:18:50 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-18 14:18:50 +0300 |
commit | 8c7f4e9d5f36cff46365a7f8c4b9c21578c1e781 (patch) | |
tree | a77e7fe7a93de11213032ed4ab1f33a3db51b738 /spec/models/deployment_spec.rb | |
parent | 00b35af3db1abfe813a778f643dad221aad51fca (diff) |
Add latest changes from gitlab-org/gitlab@13-1-stable-ee
Diffstat (limited to 'spec/models/deployment_spec.rb')
-rw-r--r-- | spec/models/deployment_spec.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/spec/models/deployment_spec.rb b/spec/models/deployment_spec.rb index 6eb006a5d67..ac2a4c9877d 100644 --- a/spec/models/deployment_spec.rb +++ b/spec/models/deployment_spec.rb @@ -114,7 +114,7 @@ describe Deployment do deployment.succeed! expect(deployment).to be_success - expect(deployment.finished_at).to be_like_time(Time.now) + expect(deployment.finished_at).to be_like_time(Time.current) end end @@ -141,7 +141,7 @@ describe Deployment do deployment.drop! expect(deployment).to be_failed - expect(deployment.finished_at).to be_like_time(Time.now) + expect(deployment.finished_at).to be_like_time(Time.current) end end @@ -161,7 +161,7 @@ describe Deployment do deployment.cancel! expect(deployment).to be_canceled - expect(deployment.finished_at).to be_like_time(Time.now) + expect(deployment.finished_at).to be_like_time(Time.current) end end @@ -587,7 +587,7 @@ describe Deployment do Timecop.freeze do deploy.update_status('success') - expect(deploy.read_attribute(:finished_at)).to eq(Time.now) + expect(deploy.read_attribute(:finished_at)).to eq(Time.current) end end end |