Commit 04c8413c authored by Rémy Coutable's avatar Rémy Coutable

Merge branch 'rails5-fix-project-registry-spec' into 'master'

Rails5: fix mysql milliseconds problem in project registry spec

See merge request gitlab-org/gitlab-ee!6943
parents 22bf1fe9 040b65f4
---
title: 'Rails5: fix mysql milliseconds problem in project registry spec'
merge_request: 6943
author: Jasper Maes
type: fixed
...@@ -264,7 +264,7 @@ describe Geo::ProjectRegistry do ...@@ -264,7 +264,7 @@ describe Geo::ProjectRegistry do
it 'sets last_repository_synced_at to now' do it 'sets last_repository_synced_at to now' do
subject.start_sync!(type) subject.start_sync!(type)
expect(subject.last_repository_synced_at).to eq(Time.now) expect(subject.last_repository_synced_at).to be_like_time(Time.now)
end end
shared_examples_for 'sets repository_retry_at to a future time' do shared_examples_for 'sets repository_retry_at to a future time' do
...@@ -320,7 +320,7 @@ describe Geo::ProjectRegistry do ...@@ -320,7 +320,7 @@ describe Geo::ProjectRegistry do
it 'sets last_wiki_synced_at to now' do it 'sets last_wiki_synced_at to now' do
subject.start_sync!(type) subject.start_sync!(type)
expect(subject.last_wiki_synced_at).to eq(Time.now) expect(subject.last_wiki_synced_at).to be_like_time(Time.now)
end end
shared_examples_for 'sets wiki_retry_at to a future time' do shared_examples_for 'sets wiki_retry_at to a future time' do
......
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