Commit 7f22bc98 authored by Douwe Maan's avatar Douwe Maan

Merge branch 'rails5-mysql-schedule-build' into 'master'

Rails 5: fix mysql milliseconds problems in scheduled build specs

See merge request gitlab-org/gitlab-ce!22170
parents e8f4bfd1 043f899b
---
title: 'Rails 5: fix mysql milliseconds problems in scheduled build specs'
merge_request: 22170
author: Jasper Maes
type: other
...@@ -17,7 +17,7 @@ describe Gitlab::Ci::Status::Build::Scheduled do ...@@ -17,7 +17,7 @@ describe Gitlab::Ci::Status::Build::Scheduled do
let(:build) { create(:ci_build, scheduled_at: 1.minute.since, project: project) } let(:build) { create(:ci_build, scheduled_at: 1.minute.since, project: project) }
it 'shows execute_in of the scheduled job' do it 'shows execute_in of the scheduled job' do
Timecop.freeze do Timecop.freeze(Time.now.change(usec: 0)) do
expect(subject.status_tooltip).to include('00:01:00') expect(subject.status_tooltip).to include('00:01:00')
end end
end end
......
...@@ -261,7 +261,7 @@ describe Ci::Build do ...@@ -261,7 +261,7 @@ describe Ci::Build do
it 'schedules BuildScheduleWorker at the right time' do it 'schedules BuildScheduleWorker at the right time' do
Timecop.freeze do Timecop.freeze do
expect(Ci::BuildScheduleWorker) expect(Ci::BuildScheduleWorker)
.to receive(:perform_at).with(1.minute.since, build.id) .to receive(:perform_at).with(be_like_time(1.minute.since), build.id)
subject subject
end end
......
...@@ -227,7 +227,7 @@ describe Ci::BuildPresenter do ...@@ -227,7 +227,7 @@ describe Ci::BuildPresenter do
it 'returns execution time' do it 'returns execution time' do
Timecop.freeze do Timecop.freeze do
is_expected.to eq(60.0) is_expected.to be_like_time(60.0)
end end
end 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