test/scheduler_test.rb in resque-scheduler-4.1.0 vs test/scheduler_test.rb in resque-scheduler-4.2.0

@@ -29,20 +29,20 @@
 
   test 'enqueue runs hooks' do
     Resque::Scheduler.env = 'production'
     config = {
       'cron' => '* * * * *',
-      'class' => 'SomeRealClass',
+      'class' => 'SomeJobWithResqueHooks',
       'args' => '/tmp'
     }
 
     Resque::Job.expects(:create).with(
-      SomeRealClass.queue, SomeRealClass, '/tmp'
+      SomeJobWithResqueHooks.queue, SomeJobWithResqueHooks, '/tmp'
     )
-    SomeRealClass.expects(:before_delayed_enqueue_example).with('/tmp')
-    SomeRealClass.expects(:before_enqueue_example).with('/tmp')
-    SomeRealClass.expects(:after_enqueue_example).with('/tmp')
+    SomeJobWithResqueHooks.expects(:before_delayed_enqueue_example).with('/tmp')
+    SomeJobWithResqueHooks.expects(:before_enqueue_example).with('/tmp')
+    SomeJobWithResqueHooks.expects(:after_enqueue_example).with('/tmp')
 
     Resque::Scheduler.enqueue_from_config(config)
   end
 
   test 'enqueue_from_config respects queue params' do
@@ -57,11 +57,11 @@
 
   test 'config makes it into the rufus_scheduler' do
     assert_equal(0, Resque::Scheduler.rufus_scheduler.jobs.size)
 
     Resque.schedule = {
-      some_ivar_job: {
+      'some_ivar_job' => {
         'cron' => '* * * * *',
         'class' => 'SomeIvarJob',
         'args' => '/tmp'
       }
     }
@@ -85,19 +85,17 @@
 
     assert_equal(1, Resque::Scheduler.rufus_scheduler.jobs.size)
     assert Resque::Scheduler.scheduled_jobs.include?('some_ivar_job')
 
     Resque.redis.del(:schedules)
-    Resque.redis.hset(
-      :schedules,
-      'some_ivar_job2',
-      Resque.encode(
+    Resque.schedule = {
+      'some_ivar_job2' => {
         'cron' => '* * * * *',
         'class' => 'SomeIvarJob',
         'args' => '/tmp/2'
-      )
-    )
+      }
+    }
 
     Resque::Scheduler.reload_schedule!
 
     assert_equal(1, Resque::Scheduler.rufus_scheduler.jobs.size)
 
@@ -311,11 +309,11 @@
         'args' => '/tmp/75'
       }
     }
     assert_equal(
       { 'cron' => '* * * * *', 'class' => 'SomeIvarJob', 'args' => '/tmp/75' },
-      Resque.decode(Resque.redis.hget(:schedules, 'my_ivar_job'))
+      Resque.schedule['my_ivar_job']
     )
   end
 
   test 'schedule= removes schedules not present in the given ' \
        'schedule argument' do
@@ -344,11 +342,11 @@
     Resque.schedule = { 'SomeIvarJob' => {
       'cron' => '* * * * *', 'args' => '/tmp/75'
     } }
     assert_equal(
       { 'cron' => '* * * * *', 'class' => 'SomeIvarJob', 'args' => '/tmp/75' },
-      Resque.decode(Resque.redis.hget(:schedules, 'SomeIvarJob'))
+      Resque.schedule['SomeIvarJob']
     )
     assert_equal('SomeIvarJob', Resque.schedule['SomeIvarJob']['class'])
   end
 
   test 'schedule= does not mutate argument' do
@@ -364,24 +362,22 @@
       'some_ivar_job',
       'cron' => '* * * * *', 'class' => 'SomeIvarJob', 'args' => '/tmp/22'
     )
     assert_equal(
       { 'cron' => '* * * * *', 'class' => 'SomeIvarJob', 'args' => '/tmp/22' },
-      Resque.decode(Resque.redis.hget(:schedules, 'some_ivar_job'))
+      Resque.schedule['some_ivar_job']
     )
     assert Resque.redis.sismember(:schedules_changed, 'some_ivar_job')
   end
 
   test 'fetch_schedule returns a schedule' do
-    Resque.redis.hset(
-      :schedules,
-      'some_ivar_job2',
-      Resque.encode(
+    Resque.schedule = {
+      'some_ivar_job2' => {
         'cron' => '* * * * *',
         'class' => 'SomeIvarJob',
         'args' => '/tmp/33'
-      )
-    )
+      }
+    }
     assert_equal(
       { 'cron' => '* * * * *', 'class' => 'SomeIvarJob', 'args' => '/tmp/33' },
       Resque.fetch_schedule('some_ivar_job2')
     )
   end