From ee373f28a1b0c0ac073354df2585ee7ede0ee676 Mon Sep 17 00:00:00 2001 From: Shinya Maeda Date: Tue, 6 Nov 2018 14:26:36 +0900 Subject: [PATCH] Fix flaky spec --- spec/services/update_deployment_service_spec.rb | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/spec/services/update_deployment_service_spec.rb b/spec/services/update_deployment_service_spec.rb index b963a84ca0c..3c55dd9659a 100644 --- a/spec/services/update_deployment_service_spec.rb +++ b/spec/services/update_deployment_service_spec.rb @@ -182,15 +182,16 @@ context "if the 'first_deployed_to_production_at' time is already set" do it "does not overwrite the older 'first_deployed_to_production_at' time" do # Previous deploy - time = Time.now - Timecop.freeze(time) { service.execute } + service.execute - expect(merge_request.reload.metrics.first_deployed_to_production_at).to be_like_time(time) + expect(merge_request.reload.metrics.first_deployed_to_production_at).to be_like_time(deployment.finished_at) # Current deploy - Timecop.freeze(time + 12.hours) { service.execute } + Timecop.travel(12.hours.from_now) do + service.execute - expect(merge_request.reload.metrics.first_deployed_to_production_at).to be_like_time(time) + expect(merge_request.reload.metrics.first_deployed_to_production_at).to be_like_time(deployment.finished_at) + end end end -- GitLab