Add a be_like_time matcher and use it in specs

The amount of precision times have in databases is variable, so we need
tolerances when comparing in specs. It's better to have the tolerance defined
in one place than several.

8 files changed, 27 insertions, 14 deletions

diff --git a/spec/models/issue/metrics_spec.rb b/spec/models/issue/metrics_spec.rb
index e170b087ebc..2459a49f095 100644
--- a/spec/models/issue/metrics_spec.rb
+++ b/spec/models/issue/metrics_spec.rb
@@ -13,7 +13,7 @@ describe Issue::Metrics, models: true do
         metrics = subject.metrics
 
         expect(metrics).to be_present
-        expect(metrics.first_associated_with_milestone_at).to be_within(1.second).of(time)
+        expect(metrics.first_associated_with_milestone_at).to be_like_time(time)
       end
 
       it "does not record the second time an issue is associated with a milestone" do
@@ -24,7 +24,7 @@ describe Issue::Metrics, models: true do
         metrics = subject.metrics
 
         expect(metrics).to be_present
-        expect(metrics.first_associated_with_milestone_at).to be_within(1.second).of(time)
+        expect(metrics.first_associated_with_milestone_at).to be_like_time(time)
       end
     end
 
@@ -36,7 +36,7 @@ describe Issue::Metrics, models: true do
         metrics = subject.metrics
 
         expect(metrics).to be_present
-        expect(metrics.first_added_to_board_at).to be_within(1.second).of(time)
+        expect(metrics.first_added_to_board_at).to be_like_time(time)
       end
 
       it "does not record the second time an issue is associated with a list label" do
@@ -48,7 +48,7 @@ describe Issue::Metrics, models: true do
         metrics = subject.metrics
 
         expect(metrics).to be_present
-        expect(metrics.first_added_to_board_at).to be_within(1.second).of(time)
+        expect(metrics.first_added_to_board_at).to be_like_time(time)
       end
     end
   end
diff --git a/spec/models/merge_request/metrics_spec.rb b/spec/models/merge_request/metrics_spec.rb
index a79dd215d41..255db41cb19 100644
--- a/spec/models/merge_request/metrics_spec.rb
+++ b/spec/models/merge_request/metrics_spec.rb
@@ -12,7 +12,7 @@ describe MergeRequest::Metrics, models: true do
       metrics = subject.metrics
 
       expect(metrics).to be_present
-      expect(metrics.merged_at).to be_within(1.second).of(time)
+      expect(metrics.merged_at).to be_like_time(time)
     end
   end
 end
diff --git a/spec/requests/api/issues_spec.rb b/spec/requests/api/issues_spec.rb
index f840778ae9b..beed53d1e5c 100644
--- a/spec/requests/api/issues_spec.rb
+++ b/spec/requests/api/issues_spec.rb
@@ -694,7 +694,7 @@ describe API::API, api: true  do
           title: 'new issue', labels: 'label, label2', created_at: creation_time
 
         expect(response).to have_http_status(201)
-        expect(Time.parse(json_response['created_at'])).to be_within(1.second).of(creation_time)
+        expect(Time.parse(json_response['created_at'])).to be_like_time(creation_time)
       end
     end
   end
@@ -895,7 +895,7 @@ describe API::API, api: true  do
         expect(response).to have_http_status(200)
 
         expect(json_response['labels']).to include 'label3'
-        expect(Time.parse(json_response['updated_at'])).to be_within(1.second).of(update_time)
+        expect(Time.parse(json_response['updated_at'])).to be_like_time(update_time)
       end
     end
   end
diff --git a/spec/requests/api/notes_spec.rb b/spec/requests/api/notes_spec.rb
index 063a8706e76..d58bedc3bf7 100644
--- a/spec/requests/api/notes_spec.rb
+++ b/spec/requests/api/notes_spec.rb
@@ -217,7 +217,7 @@ describe API::API, api: true  do
           expect(response).to have_http_status(201)
           expect(json_response['body']).to eq('hi!')
           expect(json_response['author']['username']).to eq(user.username)
-          expect(Time.parse(json_response['created_at'])).to be_within(1.second).of(creation_time)
+          expect(Time.parse(json_response['created_at'])).to be_like_time(creation_time)
         end
       end
 
diff --git a/spec/services/create_deployment_service_spec.rb b/spec/services/create_deployment_service_spec.rb
index 5fe56e7725f..0b84c7262c3 100644
--- a/spec/services/create_deployment_service_spec.rb
+++ b/spec/services/create_deployment_service_spec.rb
@@ -201,7 +201,7 @@ describe CreateDeploymentService, services: true do
           time = Time.now
           Timecop.freeze(time) { service.execute }
 
-          expect(merge_request.reload.metrics.first_deployed_to_production_at).to be_within(1.second).of(time)
+          expect(merge_request.reload.metrics.first_deployed_to_production_at).to be_like_time(time)
         end
 
         it "doesn't set the time if the deploy's environment is not 'production'" do
@@ -227,13 +227,13 @@ describe CreateDeploymentService, services: true do
             time = Time.now
             Timecop.freeze(time) { service.execute }
 
-            expect(merge_request.reload.metrics.first_deployed_to_production_at).to be_within(1.second).of(time)
+            expect(merge_request.reload.metrics.first_deployed_to_production_at).to be_like_time(time)
 
             # Current deploy
             service = described_class.new(project, user, params)
             Timecop.freeze(time + 12.hours) { service.execute }
 
-            expect(merge_request.reload.metrics.first_deployed_to_production_at).to be_within(1.second).of(time)
+            expect(merge_request.reload.metrics.first_deployed_to_production_at).to be_like_time(time)
           end
         end
 
diff --git a/spec/services/git_push_service_spec.rb b/spec/services/git_push_service_spec.rb
index dd2a9e9903a..8dda34c7a03 100644
--- a/spec/services/git_push_service_spec.rb
+++ b/spec/services/git_push_service_spec.rb
@@ -364,7 +364,7 @@ describe GitPushService, services: true do
       it 'sets the metric for referenced issues' do
         execute_service(project, user, @oldrev, @newrev, @ref)
 
-        expect(issue.reload.metrics.first_mentioned_in_commit_at).to be_within(1.second).of(commit_time)
+        expect(issue.reload.metrics.first_mentioned_in_commit_at).to be_like_time(commit_time)
       end
 
       it 'does not set the metric for non-referenced issues' do
diff --git a/spec/support/matchers/be_like_time.rb b/spec/support/matchers/be_like_time.rb
new file mode 100644
index 00000000000..1f27390eab7
--- /dev/null
+++ b/spec/support/matchers/be_like_time.rb
@@ -0,0 +1,13 @@
+RSpec::Matchers.define :be_like_time do |expected|
+  match do |actual|
+    expect(actual).to be_within(1.second).of(expected)
+  end
+
+  description do
+    "within one second of #{expected}"
+  end
+
+  failure_message do |actual|
+    "expected #{actual} to be within one second of #{expected}"
+  end
+end
diff --git a/spec/workers/pipeline_metrics_worker_spec.rb b/spec/workers/pipeline_metrics_worker_spec.rb
index 232478c9735..2c9e7c2cd02 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 be_within(1.second).of(pipeline.started_at)
+        expect(merge_request.reload.metrics.latest_build_started_at).to be_like_time(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 be_within(1.second).of(pipeline.finished_at)
+        expect(merge_request.reload.metrics.latest_build_finished_at).to be_like_time(pipeline.finished_at)
       end
     end
   end