summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorNick Thomas <nick@gitlab.com>2019-06-05 13:44:18 +0000
committerNick Thomas <nick@gitlab.com>2019-06-05 13:44:18 +0000
commitc9da437599027e9f2ef9f78a5167237f4b2a54dd (patch)
treef31f451a8a2f84a3412ea432d2930fe5da8f9d9f /spec
parentcb18dfea0505f47062096e05eda8f74111c1fc39 (diff)
parent690c4259a90e4b52c4107edabdeff60b4e05d264 (diff)
downloadgitlab-ce-c9da437599027e9f2ef9f78a5167237f4b2a54dd.tar.gz
Merge branch '62760-persistent-failure-in-spec-models-ci-pipeline_schedule_spec-rb' into 'master'
Resolve "Persistent failure in spec/models/ci/pipeline_schedule_spec.rb" Closes #62760 See merge request gitlab-org/gitlab-ce!29191
Diffstat (limited to 'spec')
-rw-r--r--spec/models/ci/pipeline_schedule_spec.rb2
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 6382be73ea7..9a6471557ea 100644
--- a/spec/models/ci/pipeline_schedule_spec.rb
+++ b/spec/models/ci/pipeline_schedule_spec.rb
@@ -97,7 +97,7 @@ describe Ci::PipelineSchedule do
let(:cron_worker_next_run_at) do
Gitlab::Ci::CronParser.new(Settings.cron_jobs['pipeline_schedule_worker']['cron'], Time.zone.name)
- .next_time_from(Time.now)
+ .next_time_from(Time.zone.now)
end
context 'when creates new pipeline schedule' do