Merge branch '62760-unquarantine-spec' into 'master'

Fix flaky time related failure in spec/models/ci/pipeline_schedule_spec.rb

Closes #62760

See merge request gitlab-org/gitlab-ce!29778
This commit is contained in:
Lin Jen-Shin 2019-06-18 09:09:05 +00:00
commit e2d217f69a

View file

@ -128,8 +128,10 @@ describe Ci::PipelineSchedule do
context 'when pipeline schedule runs every minute' do
let(:pipeline_schedule) { create(:ci_pipeline_schedule, :every_minute) }
it "updates next_run_at to the sidekiq worker's execution time", :quarantine do
expect(pipeline_schedule.next_run_at).to eq(cron_worker_next_run_at)
it "updates next_run_at to the sidekiq worker's execution time" do
Timecop.freeze do
expect(pipeline_schedule.next_run_at).to eq(cron_worker_next_run_at)
end
end
end