From 0206c6aa4189d9c1bc9967c22b120c26b6441c72 Mon Sep 17 00:00:00 2001 From: Jasper Maes Date: Tue, 6 Nov 2018 21:11:34 +0100 Subject: Rails5: fix mysql milliseconds issue in deployment model specs --- changelogs/unreleased/rails5-mysql-milliseconds-deployment-spec.yml | 5 +++++ spec/models/deployment_spec.rb | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) create mode 100644 changelogs/unreleased/rails5-mysql-milliseconds-deployment-spec.yml diff --git a/changelogs/unreleased/rails5-mysql-milliseconds-deployment-spec.yml b/changelogs/unreleased/rails5-mysql-milliseconds-deployment-spec.yml new file mode 100644 index 00000000000..8c71ecebfdb --- /dev/null +++ b/changelogs/unreleased/rails5-mysql-milliseconds-deployment-spec.yml @@ -0,0 +1,5 @@ +--- +title: 'Rails5: fix mysql milliseconds issue in deployment model specs' +merge_request: 22850 +author: Jasper Maes +type: other diff --git a/spec/models/deployment_spec.rb b/spec/models/deployment_spec.rb index 06c1e9c8c6a..270b2767c68 100644 --- a/spec/models/deployment_spec.rb +++ b/spec/models/deployment_spec.rb @@ -88,7 +88,7 @@ describe Deployment do deployment.succeed! expect(deployment).to be_success - expect(deployment.finished_at).to eq(Time.now) + expect(deployment.finished_at).to be_like_time(Time.now) end end @@ -108,7 +108,7 @@ describe Deployment do deployment.drop! expect(deployment).to be_failed - expect(deployment.finished_at).to eq(Time.now) + expect(deployment.finished_at).to be_like_time(Time.now) end end end @@ -121,7 +121,7 @@ describe Deployment do deployment.cancel! expect(deployment).to be_canceled - expect(deployment.finished_at).to eq(Time.now) + expect(deployment.finished_at).to be_like_time(Time.now) end end end -- cgit v1.2.1