Commit c2c3ee1b authored by Shinya Maeda's avatar Shinya Maeda

Clean up trigger_schedule_worker_spec.rb

parent cb082ae2
No related merge requests found
...@@ -9,6 +9,7 @@ describe TriggerScheduleWorker do ...@@ -9,6 +9,7 @@ describe TriggerScheduleWorker do
context 'when there is a scheduled trigger within next_run_at' do context 'when there is a scheduled trigger within next_run_at' do
let!(:trigger_schedule) { create(:ci_trigger_schedule, :nightly, :force_triggable) } let!(:trigger_schedule) { create(:ci_trigger_schedule, :nightly, :force_triggable) }
let(:next_time) { Gitlab::Ci::CronParser.new(trigger_schedule.cron, trigger_schedule.cron_timezone).next_time_from(Time.now) }
before do before do
worker.perform worker.perform
...@@ -23,7 +24,6 @@ describe TriggerScheduleWorker do ...@@ -23,7 +24,6 @@ describe TriggerScheduleWorker do
end end
it 'updates next_run_at' do it 'updates next_run_at' do
next_time = Gitlab::Ci::CronParser.new(trigger_schedule.cron, trigger_schedule.cron_timezone).next_time_from(Time.now)
expect(Ci::TriggerSchedule.last.next_run_at).to eq(next_time) expect(Ci::TriggerSchedule.last.next_run_at).to eq(next_time)
end end
end end
...@@ -35,12 +35,12 @@ describe TriggerScheduleWorker do ...@@ -35,12 +35,12 @@ describe TriggerScheduleWorker do
worker.perform worker.perform
end end
it 'do not create a new pipeline' do it 'does not create a new pipeline' do
expect(Ci::Pipeline.count).to eq(0) expect(Ci::Pipeline.count).to eq(0)
end end
it 'do not reschedule next_run_at' do it 'does not update next_run_at' do
expect(Ci::TriggerSchedule.last.next_run_at).to eq(trigger_schedule.next_run_at) expect(trigger_schedule.next_run_at).to eq(Ci::TriggerSchedule.last.next_run_at)
end end
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