test/plugins/restart_test.rb in rocketjob-2.1.3 vs test/plugins/restart_test.rb in rocketjob-3.0.0.alpha

@@ -5,14 +5,14 @@
   class RestartTest < Minitest::Test
     class RestartableJob < RocketJob::Job
       include RocketJob::Plugins::Restart
 
       # Ensure a new start_at and end_at is generated every time this job is restarted
-      self.rocket_job_restart_excludes = self.rocket_job_restart_excludes + %w(start_at end_at)
+      self.rocket_job_restart_excludes += %w(start_at end_at)
 
-      key :start_at, Date
-      key :end_at, Date
+      field :start_at, type: Date
+      field :end_at, type: Date
 
       def perform
         self.start_at = Date.today
         self.end_at   = Date.today
         'DONE'
@@ -26,11 +26,10 @@
         assert_equal 0, RestartableJob.count
       end
 
       after do
         @job.delete if @job && !@job.new_record?
-        RestartableJob.delete_all
       end
 
       describe '#create!' do
         it 'queues a new job' do
           @job = RestartableJob.create!
@@ -51,21 +50,21 @@
       describe '#abort!' do
         it 'queues a new job on abort' do
           @job = RestartableJob.create!
           @job.abort!
           assert_equal 2, RestartableJob.count
-          assert other = RestartableJob.where(id: {'$ne' => @job.id}).first
+          assert other = RestartableJob.where(:id.ne => @job.id).first
           refute_equal @job.id, other.id
           assert other.queued?
         end
 
         it 'does not queue a new job when expired' do
           @job = RestartableJob.create!(expires_at: Time.now - 1.day)
           assert @job.expired?
           @job.abort!
           assert_equal 1, RestartableJob.count
-          assert_equal nil, RestartableJob.where(id: {'$ne' => @job.id}).first
+          assert_equal nil, RestartableJob.where(:id.ne => @job.id).first
         end
       end
 
       describe '#complete' do
         it 'queues a new job when destroy_on_complete' do
@@ -131,29 +130,29 @@
           @job = RestartableJob.new(expires_at: Time.now - 1.day)
           @job.start!
           assert @job.running?
           assert @job.expired?
           assert_equal 1, RestartableJob.count
-          assert_equal nil, RestartableJob.where(id: {'$ne' => @job.id}).first
+          assert_equal nil, RestartableJob.where(:id.ne => @job.id).first
         end
       end
 
       describe '#create_new_instance' do
         it 'sets job back to queued state' do
           @job = RestartableJob.create!(destroy_on_complete: true)
           @job.perform_now
           assert_equal 1, RestartableJob.count
-          assert job2 = RestartableJob.where(id: {'$ne' => @job.id}).first
+          assert job2 = RestartableJob.where(:id.ne => @job.id).first
           assert job2.queued?, job2.attributes.ai
         end
 
         it 'excludes attributes related to running jobs' do
           @job = RestartableJob.create!(destroy_on_complete: true, expires_at: Time.now + 1.day)
           refute @job.expired?
           @job.perform_now
           assert_equal 1, RestartableJob.count
-          assert job2 = RestartableJob.where(id: {'$ne' => @job.id}).first
+          assert job2 = RestartableJob.where(:id.ne => @job.id).first
           assert job2.queued?, job2.attributes.ai
 
           # Copy across all attributes, except
           job2.attributes.each_pair do |key, value|
             refute_equal 'start_at', key, "Should not include start_at in retried job. #{job2.attributes.inspect}"
@@ -169,25 +168,25 @@
           assert_equal nil, job2.completed_at
           assert_equal 0, job2.failure_count
           assert_equal nil, job2.worker_name
           assert_equal 0, job2.percent_complete
           assert_equal nil, job2.exception
-          assert_equal({}, job2.result)
+          refute job2.result
         end
 
         it 'copies run_at when it is in the future' do
           @job = RestartableJob.create!(run_at: Time.now + 1.day, destroy_on_complete: true)
           @job.perform_now
           assert_equal 1, RestartableJob.count
-          assert job2 = RestartableJob.where(id: {'$ne' => @job.id}).first
+          assert job2 = RestartableJob.where(:id.ne => @job.id).first
           assert job2.run_at, job2.attributes.ai
         end
 
         it 'does not copy run_at when it is in the past' do
           @job = RestartableJob.create!(run_at: Time.now - 1.day, destroy_on_complete: true)
           @job.perform_now
           assert_equal 1, RestartableJob.count
-          assert job2 = RestartableJob.where(id: {'$ne' => @job.id}).first
+          assert job2 = RestartableJob.where(:id.ne => @job.id).first
           assert_equal nil, job2.run_at
         end
       end
 
     end