Commit 5de45557 authored by Nick Thomas's avatar Nick Thomas

Merge branch...

Merge branch '63399-intermittent-spec-failure-in-spec-models-ci-pipeline_schedule_spec-rb-131' into 'master'

Resolve "Intermittent spec failure in spec/models/ci/pipeline_schedule_spec.rb:131"

Closes #63399

See merge request gitlab-org/gitlab-ce!29838
parents f5023eef 31cef128
...@@ -129,7 +129,7 @@ describe Ci::PipelineSchedule do ...@@ -129,7 +129,7 @@ describe Ci::PipelineSchedule do
let(:pipeline_schedule) { create(:ci_pipeline_schedule, :every_minute) } let(:pipeline_schedule) { create(:ci_pipeline_schedule, :every_minute) }
it "updates next_run_at to the sidekiq worker's execution time" do it "updates next_run_at to the sidekiq worker's execution time" do
Timecop.freeze do Timecop.freeze(2019, 06, 19, 12, 00) do
expect(pipeline_schedule.next_run_at).to eq(cron_worker_next_run_at) expect(pipeline_schedule.next_run_at).to eq(cron_worker_next_run_at)
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