kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'rails5-mysql-milliseconds-deployment-spec' into 'master' 

Rails5: fix mysql milliseconds issue in deployment model specs

See merge request gitlab-org/gitlab-ce!22850
This commit is contained in:
Douglas Barbosa Alexandre 2018-11-06 22:09:54 +00:00
parent 173c6ca1e8 0206c6aa41
commit cf8fe12b7b
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
changelogs/unreleased/rails5-mysql-milliseconds-deployment-spec.yml Normal file
View File

@ -0,0 +1,5 @@
---
title: 'Rails5: fix mysql milliseconds issue in deployment model specs'
merge_request: 22850
author: Jasper Maes
type: other

6
spec/models/deployment_spec.rb
View File

@ -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