Skip to content

Commit b88d6a3

Browse files
codealchemyPatrickTulskie
authored andcommitted
Fix Resque::Scheduler.print_schedule
Added in 893f13c, this is intended to help with debugging. The `:t` and `:last` attrs were removed in the jmettraux/rufus-scheduler@v2.0.24...v3.0.0 It seems `#print_schedule` likely hasn't worked since the `rufus-scheduler` depenency was bumped to require ~3.0 in d24657e#diff-9732d81ad66d6656923a3883e83f6620a3b16a07484745677a0776f6e0bff025. This fixes the `OpenStruct` warnings seen in tests for newer Ruby versions.
1 parent fbf874e commit b88d6a3

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

lib/resque/scheduler.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,8 @@ def print_schedule
8686
if rufus_scheduler
8787
log! "Scheduling Info\tLast Run"
8888
scheduler_jobs = rufus_scheduler.jobs
89-
scheduler_jobs.each do |_k, v|
90-
log! "#{v.t}\t#{v.last}\t"
89+
scheduler_jobs.each do |job|
90+
log! "#{job.opts}\t#{job.last_time}\t"
9191
end
9292
end
9393
end

test/scheduler_test.rb

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -589,15 +589,15 @@ def enqueue_started!
589589

590590
context 'printing schedule' do
591591
setup do
592-
Resque::Scheduler.expects(:log!).at_least_once
592+
Resque::Scheduler.stubs(:log!)
593593
end
594594

595595
test 'prints schedule' do
596-
fake_rufus_scheduler = mock
597-
fake_rufus_scheduler.expects(:jobs).at_least_once
598-
.returns(foo: OpenStruct.new(t: nil, last: nil))
599-
Resque::Scheduler.expects(:rufus_scheduler).at_least_once
600-
.returns(fake_rufus_scheduler)
596+
rufus_scheduler = Rufus::Scheduler.new
597+
fake_job = rufus_scheduler.at(Time.now + 1, job: true) {}
598+
Resque::Scheduler.expects(:rufus_scheduler).at_least_once.returns(rufus_scheduler)
599+
Resque::Scheduler.expects(:log!).with("#{fake_job.opts}\t#{fake_job.last_time}\t")
600+
601601
Resque::Scheduler.print_schedule
602602
end
603603
end

0 commit comments

Comments
 (0)