diff --git a/lib/resque/scheduler.rb b/lib/resque/scheduler.rb index 9f54c4d3..4f008c20 100644 --- a/lib/resque/scheduler.rb +++ b/lib/resque/scheduler.rb @@ -86,8 +86,8 @@ def print_schedule if rufus_scheduler log! "Scheduling Info\tLast Run" scheduler_jobs = rufus_scheduler.jobs - scheduler_jobs.each do |_k, v| - log! "#{v.t}\t#{v.last}\t" + scheduler_jobs.each do |job| + log! "#{job.opts}\t#{job.last_time}\t" end end end diff --git a/test/scheduler_test.rb b/test/scheduler_test.rb index ab47461d..470569b3 100644 --- a/test/scheduler_test.rb +++ b/test/scheduler_test.rb @@ -587,15 +587,15 @@ def enqueue_started! context 'printing schedule' do setup do - Resque::Scheduler.expects(:log!).at_least_once + Resque::Scheduler.stubs(:log!) end test 'prints schedule' do - fake_rufus_scheduler = mock - fake_rufus_scheduler.expects(:jobs).at_least_once - .returns(foo: OpenStruct.new(t: nil, last: nil)) - Resque::Scheduler.expects(:rufus_scheduler).at_least_once - .returns(fake_rufus_scheduler) + rufus_scheduler = Rufus::Scheduler.new + fake_job = rufus_scheduler.at(Time.now + 1, job: true) {} + Resque::Scheduler.expects(:rufus_scheduler).at_least_once.returns(rufus_scheduler) + Resque::Scheduler.expects(:log!).with("#{fake_job.opts}\t#{fake_job.last_time}\t") + Resque::Scheduler.print_schedule end end