summaryrefslogtreecommitdiff
path: root/spec/workers
diff options
context:
space:
mode:
authorShinya Maeda <gitlab.shinyamaeda@gmail.com>2017-04-05 17:48:28 +0900
committerShinya Maeda <gitlab.shinyamaeda@gmail.com>2017-04-06 23:46:59 +0900
commitc2c3ee1bf9101b68b59685fa046759729eeadda1 (patch)
tree06ff01b2db3533253b52e439fe312c29f54252d5 /spec/workers
parentcb082ae291ba13120bfffeac5cd5a7c4532142ff (diff)
downloadgitlab-ce-c2c3ee1bf9101b68b59685fa046759729eeadda1.tar.gz
Clean up trigger_schedule_worker_spec.rb
Diffstat (limited to 'spec/workers')
-rw-r--r--spec/workers/trigger_schedule_worker_spec.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/spec/workers/trigger_schedule_worker_spec.rb b/spec/workers/trigger_schedule_worker_spec.rb
index 9d8fd9305ca..3997369489f 100644
--- a/spec/workers/trigger_schedule_worker_spec.rb
+++ b/spec/workers/trigger_schedule_worker_spec.rb
@@ -9,6 +9,7 @@ describe TriggerScheduleWorker do
context 'when there is a scheduled trigger within next_run_at' do
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
worker.perform
@@ -23,7 +24,6 @@ describe TriggerScheduleWorker do
end
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)
end
end
@@ -35,12 +35,12 @@ describe TriggerScheduleWorker do
worker.perform
end
- it 'do not create a new pipeline' do
+ it 'does not create a new pipeline' do
expect(Ci::Pipeline.count).to eq(0)
end
- it 'do not reschedule next_run_at' do
- expect(Ci::TriggerSchedule.last.next_run_at).to eq(trigger_schedule.next_run_at)
+ it 'does not update next_run_at' do
+ expect(trigger_schedule.next_run_at).to eq(Ci::TriggerSchedule.last.next_run_at)
end
end
end