Commit cf8fe12b authored by Douglas Barbosa Alexandre's avatar Douglas Barbosa Alexandre

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
parents 173c6ca1 0206c6aa
---
title: 'Rails5: fix mysql milliseconds issue in deployment model specs'
merge_request: 22850
author: Jasper Maes
type: other
......@@ -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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment