Add latest changes from gitlab-org/gitlab@13-1-stable-ee

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