diff options
author | Douwe Maan <douwe@gitlab.com> | 2016-10-17 13:41:03 +0000 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2016-10-17 13:41:03 +0000 |
commit | 77507df6030dad9e317e092c70003d4c85d8f889 (patch) | |
tree | 793ea9df37dcc3c419225089fcf77b8a46113b63 | |
parent | d2591df1642654b2d211ddbb3dee1edc1592bd98 (diff) | |
parent | 009da2fc80924778ba61c6363b6e12d7daf1fa75 (diff) | |
download | gitlab-ce-77507df6030dad9e317e092c70003d4c85d8f889.tar.gz |
Merge branch 'fix-pipeline-metrics-failure' into 'master'
dz-check-if-green23430-accept-full-linkedin-url-on-gitlab-profile-page
Fix broken specs on MySQL
## What does this MR do?
Fixes broken master after https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6896
See merge request !6935
-rw-r--r-- | spec/workers/pipeline_metrics_worker_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/workers/pipeline_metrics_worker_spec.rb b/spec/workers/pipeline_metrics_worker_spec.rb index f58df3f0d6e..232478c9735 100644 --- a/spec/workers/pipeline_metrics_worker_spec.rb +++ b/spec/workers/pipeline_metrics_worker_spec.rb @@ -23,7 +23,7 @@ describe PipelineMetricsWorker do it 'records the build start time' do subject - expect(merge_request.reload.metrics.latest_build_started_at).to eq(pipeline.started_at) + expect(merge_request.reload.metrics.latest_build_started_at).to be_within(1.second).of(pipeline.started_at) end it 'clears the build end time' do @@ -39,7 +39,7 @@ describe PipelineMetricsWorker do it 'records the build end time' do subject - expect(merge_request.reload.metrics.latest_build_finished_at).to eq(pipeline.finished_at) + expect(merge_request.reload.metrics.latest_build_finished_at).to be_within(1.second).of(pipeline.finished_at) end end end |