diff options
| author | Nick Thomas <nick@gitlab.com> | 2019-06-19 10:37:32 +0000 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2019-06-19 10:37:32 +0000 |
| commit | 5de45557988ed61c753c37df5f535fceb8f6bb1a (patch) | |
| tree | 0ea4303bda50da25941d8f590f280a6ee78477a1 | |
| parent | f5023eefb1daaa8357407f199d0dac536094c54d (diff) | |
| parent | 31cef128e8535c9f9701755024b18f04194f472c (diff) | |
| download | gitlab-ce-5de45557988ed61c753c37df5f535fceb8f6bb1a.tar.gz | |
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
| -rw-r--r-- | spec/models/ci/pipeline_schedule_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/models/ci/pipeline_schedule_spec.rb b/spec/models/ci/pipeline_schedule_spec.rb index c4d8ad5317a..d7b81caddf5 100644 --- a/spec/models/ci/pipeline_schedule_spec.rb +++ b/spec/models/ci/pipeline_schedule_spec.rb @@ -129,7 +129,7 @@ describe Ci::PipelineSchedule do let(:pipeline_schedule) { create(:ci_pipeline_schedule, :every_minute) } 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) end end |