Commit 336aaeaa authored by Heinrich Lee Yu's avatar Heinrich Lee Yu

Merge branch 'sh-freeze-period-not-frozen' into 'master'

Fix deploy freeze tests failing on weekends

Closes #224786

See merge request gitlab-org/gitlab!35473
parents f9fd6b55 b5e141c3
......@@ -2231,8 +2231,8 @@ RSpec.describe Ci::CreatePipelineService do
end
context 'when outside freeze period' do
Timecop.freeze(2020, 4, 10, 22, 59) do
it 'creates two jobs' do
Timecop.freeze(2020, 4, 10, 22, 59) do
expect(pipeline).to be_persisted
expect(build_names).to contain_exactly('test-job', 'deploy-job')
end
......@@ -2265,8 +2265,8 @@ RSpec.describe Ci::CreatePipelineService do
end
context 'when outside freeze period' do
Timecop.freeze(2020, 4, 10, 22, 59) do
it 'creates two jobs' do
Timecop.freeze(2020, 4, 10, 22, 59) do
expect(pipeline).to be_persisted
expect(build_names).to contain_exactly('deploy-job')
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