diff options
author | Jasper Maes <jaspermaes.jm@gmail.com> | 2018-11-06 21:11:34 +0100 |
---|---|---|
committer | Jasper Maes <jaspermaes.jm@gmail.com> | 2018-11-06 21:14:47 +0100 |
commit | 0206c6aa4189d9c1bc9967c22b120c26b6441c72 (patch) | |
tree | 5a5c3a76456322aac0f46dbcd7b71d13407e2464 | |
parent | 173c6ca1e8925d69e9aba88c8331096521d3f388 (diff) | |
download | gitlab-ce-0206c6aa4189d9c1bc9967c22b120c26b6441c72.tar.gz |
Rails5: fix mysql milliseconds issue in deployment model specs
-rw-r--r-- | changelogs/unreleased/rails5-mysql-milliseconds-deployment-spec.yml | 5 | ||||
-rw-r--r-- | spec/models/deployment_spec.rb | 6 |
2 files changed, 8 insertions, 3 deletions
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 |