rocketjob 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 75e6c5434b4b1968db94743e4b81fcc0a68cabc3
-  data.tar.gz: 735b0996986532d05ee46c546df4033a2b0d3c95
+  metadata.gz: 0791ec0844d63115ea5d7b5a1205fe21e72a635c
+  data.tar.gz: 1898e2c267dce737cfa546796d700c72a06bcad7
 SHA512:
-  metadata.gz: 0556e6e99fa676eaa9eea871b5c32ffa372794ad5358a16f1daa11f28e0739bfc7954760d00a1d1d358ad135dfcf88e08823cdd22957fc41a5fbeb47b71fd0bd
-  data.tar.gz: f780fa752304a93234e9dee155ab47a1949011c20d4a7cd2a949b068e0c65e195296a6edf7469d95af695d9c83d2f8041bcc3d53964fe2e71814d2a28dafeb5c
+  metadata.gz: 14da955ecac4f0b1316c343de006c53d1df296c24c9982c72c48e4ca12631d1283e89e64b999d488a26907503e7b46801c5ace72096dd4b0d3f02c6631f4e001
+  data.tar.gz: f97236b79cfab5ade58b30afebbd8ef05e462ef3f264c70860ab9cc8c2061257f6789bbc3b8d339f80a7d9ca1b17c7e6834678ca1b44958296683543e8adb32f

data/lib/rocket_job/dirmon_entry.rb

@@ -51,13 +51,13 @@ module RocketJob
     #   Regular Expression
     #
     # Note: Date is not supported, convert it to a UTC time
-    key :arguments,          Array, default: []
+    key :arguments,          Array
 
     # Any job properties to set
     #
     # Example, override the default job priority:
     #   { priority: 45 }
-    key :properties,         Hash, default: {}
+    key :properties,         Hash
 
     # Archive directory to move files to when processed to prevent processing the
     # file again.

data/lib/rocket_job/job.rb

@@ -65,7 +65,7 @@ module RocketJob
     #   Regular Expression
     #
     # Note: Date is not supported, convert it to a UTC time
-    key :arguments,               Array,    default: []
+    key :arguments,               Array
 
     # Whether to store the results from this job
     key :collect_output,          Boolean, default: false
@@ -382,6 +382,7 @@ module RocketJob
 
     def before_retry
       self.completed_at = nil
+      self.exception = nil
     end
 
     def before_pause

data/lib/rocket_job/job_exception.rb

@@ -14,7 +14,7 @@ module RocketJob
     key :message,                 String
 
     # Exception Backtrace [Array<String>]
-    key :backtrace,               Array, default: []
+    key :backtrace,               Array
 
     # Name of the worker on which this exception occurred
     key :worker_name,             String

data/lib/rocket_job/version.rb

@@ -1,4 +1,4 @@
 # encoding: UTF-8
 module RocketJob #:nodoc
-  VERSION = '1.1.2'
+  VERSION = '1.1.3'
 end

data/test/dirmon_entry_test.rb

@@ -3,54 +3,56 @@ require_relative 'jobs/test_job'
 
 # Unit Test for RocketJob::Job
 class DirmonEntryTest < Minitest::Test
-  context RocketJob::DirmonEntry do
-    context '.config' do
-      should 'support multiple databases' do
+  describe RocketJob::DirmonEntry do
+    describe '.config' do
+      it 'support multiple databases' do
         assert_equal 'test_rocketjob', RocketJob::DirmonEntry.collection.db.name
       end
     end
 
-    context '#job_class' do
-      context 'with a nil job_class_name' do
-        should 'return nil' do
+    describe '#job_class' do
+      describe 'with a nil job_class_name' do
+        it 'return nil' do
           entry = RocketJob::DirmonEntry.new
           assert_equal(nil, entry.job_class)
         end
       end
 
-      context 'with an unknown job_class_name' do
-        should 'return nil' do
+      describe 'with an unknown job_class_name' do
+        it 'return nil' do
           entry = RocketJob::DirmonEntry.new(job_class_name: 'FakeJobThatDoesNotExistAnyWhereIPromise')
           assert_equal(nil, entry.job_class)
         end
       end
 
-      context 'with a valid job_class_name' do
-        should 'return job class' do
+      describe 'with a valid job_class_name' do
+        it 'return job class' do
           entry = RocketJob::DirmonEntry.new(job_class_name: 'RocketJob::Job')
           assert_equal(RocketJob::Job, entry.job_class)
+          assert_equal 0, entry.arguments.size
+          assert_equal 0, entry.properties.size
         end
       end
     end
 
-    context '.whitelist_paths' do
-      should 'default to []' do
+    describe '.whitelist_paths' do
+      it 'default to []' do
         assert_equal [], RocketJob::DirmonEntry.whitelist_paths
       end
     end
 
-    context '.add_whitelist_path' do
-      teardown do
+    describe '.add_whitelist_path' do
+      after do
         RocketJob::DirmonEntry.whitelist_paths.each { |path| RocketJob::DirmonEntry.delete_whitelist_path(path) }
       end
 
-      should 'convert relative path to an absolute one' do
+      it 'convert relative path to an absolute one' do
         path = Pathname('test/jobs').realpath.to_s
         assert_equal path, RocketJob::DirmonEntry.add_whitelist_path('test/jobs')
         assert_equal [path], RocketJob::DirmonEntry.whitelist_paths
       end
 
-      should 'prevent duplicates' do
+      it 'prevent duplicates' do
         path = Pathname('test/jobs').realpath.to_s
         assert_equal path, RocketJob::DirmonEntry.add_whitelist_path('test/jobs')
         assert_equal path, RocketJob::DirmonEntry.add_whitelist_path('test/jobs')
@@ -59,23 +61,23 @@ class DirmonEntryTest < Minitest::Test
       end
     end
 
-    context '#fail_with_exception!' do
-      setup do
+    describe '#fail_with_exception!' do
+      before do
         @dirmon_entry = RocketJob::DirmonEntry.new(job_class_name: 'Jobs::TestJob', pattern: '/abc/**', arguments: [1])
         @dirmon_entry.enable!
       end
-      teardown do
+      after do
         @dirmon_entry.destroy if @dirmon_entry && @dirmon_entry.new_record?
       end
 
-      should 'fail with message' do
+      it 'fail with message' do
         @dirmon_entry.fail_with_exception!('myworker:2323', 'oh no')
         assert_equal true, @dirmon_entry.failed?
         assert_equal 'RocketJob::DirmonEntryException', @dirmon_entry.exception.class_name
         assert_equal 'oh no', @dirmon_entry.exception.message
       end
 
-      should 'fail with exception' do
+      it 'fail with exception' do
         exception = nil
         begin
           blah
@@ -90,16 +92,16 @@ class DirmonEntryTest < Minitest::Test
       end
     end
 
-    context '#validate' do
-      should 'existance' do
+    describe '#validate' do
+      it 'existance' do
         assert entry = RocketJob::DirmonEntry.new(job_class_name: 'Jobs::TestJob')
         assert_equal false, entry.valid?
         assert_equal ["can't be blank"], entry.errors[:pattern], entry.errors.inspect
       end
 
-      context 'perform_method' do
-        context 'with an invalid method' do
-          should 'add errors to the entry' do
+      describe 'perform_method' do
+        describe 'with an invalid method' do
+          it 'add errors to the entry' do
             entry = RocketJob::DirmonEntry.new(job_class_name: 'Jobs::TestJob', perform_method: :missing_perform_method)
             assert_equal false, entry.valid?
             assert_equal ['Method not implemented by Jobs::TestJob'], entry.errors[:perform_method], entry.errors.inspect
@@ -107,16 +109,16 @@ class DirmonEntryTest < Minitest::Test
         end
       end
 
-      context 'job_class_name' do
-        should 'ensure presence' do
+      describe 'job_class_name' do
+        it 'ensure presence' do
           assert entry = RocketJob::DirmonEntry.new(pattern: '/abc/**')
           assert_equal false, entry.valid?
           assert_equal ["can't be blank", 'job_class_name must be defined and must be derived from RocketJob::Job'], entry.errors[:job_class_name], entry.errors.inspect
         end
       end
 
-      context 'arguments' do
-        should 'allow no arguments' do
+      describe 'arguments' do
+        it 'allow no arguments' do
           assert entry = RocketJob::DirmonEntry.new(
               job_class_name: 'Jobs::TestJob',
               pattern:        '/abc/**',
@@ -126,7 +128,7 @@ class DirmonEntryTest < Minitest::Test
           assert_equal [], entry.errors[:arguments], entry.errors.inspect
         end
 
-        should 'ensure correct number of arguments' do
+        it 'ensure correct number of arguments' do
           assert entry = RocketJob::DirmonEntry.new(
               job_class_name: 'Jobs::TestJob',
               pattern:        '/abc/**'
@@ -135,7 +137,7 @@ class DirmonEntryTest < Minitest::Test
           assert_equal ['There must be 1 argument(s)'], entry.errors[:arguments], entry.errors.inspect
         end
 
-        should 'return false if the job name is bad' do
+        it 'return false if the job name is bad' do
           assert entry = RocketJob::DirmonEntry.new(
               job_class_name: 'Jobs::Tests::Names::Things',
               pattern:        '/abc/**'
@@ -145,7 +147,7 @@ class DirmonEntryTest < Minitest::Test
         end
       end
 
-      should 'arguments with perform_method' do
+      it 'arguments with perform_method' do
         assert entry = RocketJob::DirmonEntry.new(
             job_class_name: 'Jobs::TestJob',
             pattern:        '/abc/**',
@@ -155,7 +157,7 @@ class DirmonEntryTest < Minitest::Test
         assert_equal ['There must be 2 argument(s)'], entry.errors[:arguments], entry.errors.inspect
       end
 
-      should 'valid' do
+      it 'valid' do
         assert entry = RocketJob::DirmonEntry.new(
             job_class_name: 'Jobs::TestJob',
             pattern:        '/abc/**',
@@ -164,7 +166,7 @@ class DirmonEntryTest < Minitest::Test
         assert entry.valid?, entry.errors.inspect
       end
 
-      should 'valid with perform_method' do
+      it 'valid with perform_method' do
         assert entry = RocketJob::DirmonEntry.new(
             job_class_name: 'Jobs::TestJob',
             pattern:        '/abc/**',
@@ -175,8 +177,8 @@ class DirmonEntryTest < Minitest::Test
       end
     end
 
-    context 'with valid entry' do
-      setup do
+    describe 'with valid entry' do
+      before do
         @archive_directory = '/tmp/archive_directory'
         @entry             = RocketJob::DirmonEntry.new(
           pattern:           'abc/*',
@@ -194,37 +196,37 @@ class DirmonEntryTest < Minitest::Test
         @archive_file_name = File.join(@archive_directory, "#{@job.id}_#{File.basename(@file_name)}")
       end
 
-      teardown do
+      after do
         @file.delete if @file
       end
 
-      context '#archive_pathname' do
-        should 'with archive directory' do
+      describe '#archive_pathname' do
+        it 'with archive directory' do
           assert_equal @archive_directory.to_s, @entry.archive_pathname.to_s
         end
 
-        should 'without archive directory' do
+        it 'without archive directory' do
           @entry.archive_directory = nil
           assert_equal '_archive', @entry.archive_pathname.to_s
         end
       end
 
-      context '#archive_file' do
-        should 'archive file' do
+      describe '#archive_file' do
+        it 'archive file' do
           assert_equal @archive_file_name, @entry.send(:archive_file, @job, Pathname.new(@file_name))
           assert File.exists?(@archive_file_name), @archive_file_name
         end
       end
 
-      context '#upload_default' do
-        should 'upload' do
+      describe '#upload_default' do
+        it 'upload' do
           @entry.send(:upload_default, @job, @pathname)
           assert_equal File.absolute_path(@archive_file_name), @job.arguments.first[:full_file_name], @job.arguments
         end
       end
 
-      context '#upload_file' do
-        should 'upload using #file_store_upload' do
+      describe '#upload_file' do
+        it 'upload using #file_store_upload' do
           @job.define_singleton_method(:file_store_upload) do |file_name|
             self.description = "FILE:#{file_name}"
           end
@@ -232,7 +234,7 @@ class DirmonEntryTest < Minitest::Test
           assert_equal "FILE:#{@file_name}", @job.description
         end
 
-        should 'upload using #upload' do
+        it 'upload using #upload' do
           @job.define_singleton_method(:upload) do |file_name|
             self.description = "FILE:#{file_name}"
           end
@@ -241,8 +243,8 @@ class DirmonEntryTest < Minitest::Test
         end
       end
 
-      context '#later' do
-        should 'enqueue job' do
+      describe '#later' do
+        it 'enqueue job' do
           @entry.arguments = [{}]
           @entry.perform_method = :event
           job = @entry.later(@pathname)

data/test/dirmon_job_test.rb

@@ -3,8 +3,8 @@ require_relative 'jobs/test_job'
 
 # Unit Test for RocketJob::Job
 class DirmonJobTest < Minitest::Test
-  context RocketJob::Jobs::DirmonJob do
-    setup do
+  describe RocketJob::Jobs::DirmonJob do
+    before do
       @dirmon_job        = RocketJob::Jobs::DirmonJob.new
       @directory         = '/tmp/directory'
       @archive_directory = '/tmp/archive_directory'
@@ -19,14 +19,14 @@ class DirmonJobTest < Minitest::Test
       FileUtils.makedirs(@archive_directory)
     end
 
-    teardown do
+    after do
       @dirmon_job.destroy if @dirmon_job && !@dirmon_job.new_record?
       FileUtils.remove_dir(@archive_directory, true) if Dir.exist?(@archive_directory)
       FileUtils.remove_dir(@directory, true) if Dir.exist?(@directory)
     end
 
-    context '#check_file' do
-      should 'check growing file' do
+    describe '#check_file' do
+      it 'check growing file' do
         previous_size = 5
         new_size      = 10
         file          = Tempfile.new('check_file')
@@ -39,7 +39,7 @@ class DirmonJobTest < Minitest::Test
         assert_equal new_size, result
       end
 
-      should 'check completed file' do
+      it 'check completed file' do
         previous_size = 10
         new_size      = 10
         file          = Tempfile.new('check_file')
@@ -54,7 +54,7 @@ class DirmonJobTest < Minitest::Test
         assert started
       end
 
-      should 'check deleted file' do
+      it 'check deleted file' do
         previous_size = 5
         file_name     = Pathname.new('blah')
         result        = @dirmon_job.send(:check_file, @entry, file_name, previous_size)
@@ -62,23 +62,23 @@ class DirmonJobTest < Minitest::Test
       end
     end
 
-    context '#check_directories' do
-      setup do
+    describe '#check_directories' do
+      before do
         RocketJob::DirmonEntry.destroy_all
         @entry.enable!
       end
 
-      teardown do
+      after do
         @entry.destroy if @entry
       end
 
-      should 'no files' do
+      it 'no files' do
         previous_file_names = {}
         result              = @dirmon_job.send(:check_directories, previous_file_names)
         assert_equal 0, result.count
       end
 
-      should 'collect new files without enqueuing them' do
+      it 'collect new files without enqueuing them' do
         create_file("#{@directory}/abc/file1", 5)
         create_file("#{@directory}/abc/file2", 10)
 
@@ -89,7 +89,7 @@ class DirmonJobTest < Minitest::Test
         assert_equal 10, result.values.second, result.inspect
       end
 
-      should 'allow files to grow' do
+      it 'allow files to grow' do
         create_file("#{@directory}/abc/file1", 5)
         create_file("#{@directory}/abc/file2", 10)
         previous_file_names = {}
@@ -102,7 +102,7 @@ class DirmonJobTest < Minitest::Test
         assert_equal 15, result.values.second, result.inspect
       end
 
-      should 'start all files' do
+      it 'start all files' do
         create_file("#{@directory}/abc/file1", 5)
         create_file("#{@directory}/abc/file2", 10)
         previous_file_names = @dirmon_job.send(:check_directories, {})
@@ -115,7 +115,7 @@ class DirmonJobTest < Minitest::Test
         assert_equal 0, result.count, result.inspect
       end
 
-      should 'skip files in archive directory' do
+      it 'skip files in archive directory' do
         @entry.archive_directory = nil
         @entry.pattern = "#{@directory}/abc/**/*"
 
@@ -132,8 +132,8 @@ class DirmonJobTest < Minitest::Test
       end
     end
 
-    context '#perform' do
-      should 'check directories and reschedule' do
+    describe '#perform' do
+      it 'check directories and reschedule' do
         dirmon_job          = nil
         previous_file_names = {
           "#{@directory}/abc/file1" => 5,
@@ -153,7 +153,7 @@ class DirmonJobTest < Minitest::Test
         end
         assert dirmon_job.completed?, dirmon_job.status.inspect
 
-        # It should have enqueued another instance to run in the future
+        # It it have enqueued another instance to run in the future
         assert_equal 1, RocketJob::Jobs::DirmonJob.count
         assert new_dirmon_job = RocketJob::Jobs::DirmonJob.last
         assert_equal false, dirmon_job.id == new_dirmon_job.id
@@ -165,7 +165,7 @@ class DirmonJobTest < Minitest::Test
         new_dirmon_job.destroy
       end
 
-        should 'check directories and reschedule even on exception' do
+        it 'check directories and reschedule even on exception' do
           dirmon_job = nil
           RocketJob::Jobs::DirmonJob.destroy_all
           RocketJob::Jobs::DirmonJob.stub_any_instance(:check_directories, -> previous { raise RuntimeError.new("Oh no") }) do
@@ -177,7 +177,7 @@ class DirmonJobTest < Minitest::Test
           end
           assert dirmon_job.failed?, dirmon_job.status.inspect
 
-          # It should have enqueued another instance to run in the future
+          # It it have enqueued another instance to run in the future
           assert_equal 2, RocketJob::Jobs::DirmonJob.count
           assert new_dirmon_job = RocketJob::Jobs::DirmonJob.last
           assert new_dirmon_job.run_at
@@ -188,9 +188,9 @@ class DirmonJobTest < Minitest::Test
           new_dirmon_job.destroy
         end
     end
-  end
 
-  def create_file(file_name, size)
-    File.open(file_name, 'w') { |file| file.write('*' * size) }
+    def create_file(file_name, size)
+      File.open(file_name, 'w') { |file| file.write('*' * size) }
+    end
   end
 end

data/test/job_test.rb

@@ -3,8 +3,8 @@ require_relative 'jobs/test_job'
 
 # Unit Test for RocketJob::Job
 class JobTest < Minitest::Test
-  context RocketJob::Job do
-    setup do
+  describe RocketJob::Job do
+    before do
       @worker = RocketJob::Worker.new
       @worker.started
       @description = 'Hello World'
@@ -21,19 +21,19 @@ class JobTest < Minitest::Test
       )
     end
 
-    teardown do
+    after do
       @job.destroy if @job && !@job.new_record?
       @job2.destroy if @job2 && !@job2.new_record?
     end
 
-    context '.config' do
-      should 'support multiple databases' do
+    describe '.config' do
+      it 'support multiple databases' do
         assert_equal 'test_rocketjob', RocketJob::Job.collection.db.name
       end
     end
 
-    context '#reload' do
-      should 'handle hash' do
+    describe '#reload' do
+      it 'handle hash' do
         @job = Jobs::TestJob.new(
           description:         @description,
           arguments:           [{key: 'value'}],
@@ -53,8 +53,8 @@ class JobTest < Minitest::Test
       end
     end
 
-    context '#save!' do
-      should 'save a blank job' do
+    describe '#save!' do
+      it 'save a blank job' do
         @job.save!
         assert_nil @job.worker_name
         assert_nil @job.completed_at
@@ -72,15 +72,15 @@ class JobTest < Minitest::Test
       end
     end
 
-    context '#status' do
-      should 'return status for a queued job' do
+    describe '#status' do
+      it 'return status for a queued job' do
         assert_equal true, @job.queued?
         h = @job.status
         assert_equal :queued, h['state']
         assert_equal @description, h['description']
       end
 
-      should 'return status for a failed job' do
+      it 'return status for a failed job' do
         @job.start!
         @job.fail!('worker:1234', 'oh no')
         assert_equal true, @job.failed?
@@ -91,7 +91,7 @@ class JobTest < Minitest::Test
         assert_equal 'oh no', h['exception']['message'], h
       end
 
-      should 'mark user as reason for failure when not supplied' do
+      it 'mark user as reason for failure when not supplied' do
         @job.start!
         @job.fail!
         assert_equal true, @job.failed?
@@ -102,8 +102,8 @@ class JobTest < Minitest::Test
       end
     end
 
-    context '#fail_with_exception!' do
-      should 'fail with message' do
+    describe '#fail_with_exception!' do
+      it 'fail with message' do
         @job.start!
         @job.fail!('myworker:2323', 'oh no')
         assert_equal true, @job.failed?
@@ -114,7 +114,7 @@ class JobTest < Minitest::Test
         assert_equal 'oh no', h['exception']['message'], h
       end
 
-      should 'fail with exception' do
+      it 'fail with exception' do
         @job.start!
         exception = nil
         begin
@@ -132,15 +132,15 @@ class JobTest < Minitest::Test
       end
     end
 
-    context '#work' do
-      should 'call default perform method' do
+    describe '#work' do
+      it 'call default perform method' do
         @job.start!
         assert_equal false, @job.work(@worker)
         assert_equal true, @job.completed?, @job.state
         assert_equal 2, Jobs::TestJob.result
       end
 
-      should 'call specific method' do
+      it 'call specific method' do
         @job.perform_method = :sum
         @job.arguments      = [23, 45]
         @job.start!
@@ -149,14 +149,14 @@ class JobTest < Minitest::Test
         assert_equal 68, Jobs::TestJob.result
       end
 
-      should 'destroy on complete' do
+      it 'destroy on complete' do
         @job.destroy_on_complete = true
         @job.start!
         assert_equal false, @job.work(@worker)
         assert_equal nil, RocketJob::Job.find_by_id(@job.id)
       end
 
-      should 'silence logging when log_level is set' do
+      it 'silence logging when log_level is set' do
         @job.destroy_on_complete = true
         @job.log_level           = :warn
         @job.perform_method      = :noisy_logger
@@ -169,7 +169,7 @@ class JobTest < Minitest::Test
         assert_equal false, logged
       end
 
-      should 'raise logging when log_level is set' do
+      it 'raise logging when log_level is set' do
         @job.destroy_on_complete = true
         @job.log_level           = :trace
         @job.perform_method      = :debug_logging
@@ -185,7 +185,7 @@ class JobTest < Minitest::Test
         assert_equal false, logged
       end
 
-      should 'call before and after' do
+      it 'call before and after' do
         named_parameters    = {'counter' => 23}
         @job.perform_method = :event
         @job.arguments      = [named_parameters]
@@ -197,35 +197,35 @@ class JobTest < Minitest::Test
 
     end
 
-    context '.next_job' do
-      setup do
+    describe '.next_job' do
+      before do
         RocketJob::Job.destroy_all
       end
 
-      should 'return nil when no jobs available' do
+      it 'return nil when no jobs available' do
         assert_equal nil, RocketJob::Job.next_job(@worker.name)
       end
 
-      should 'return the first job' do
+      it 'return the first job' do
         @job.save!
         assert job = RocketJob::Job.next_job(@worker.name), 'Failed to find job'
         assert_equal @job.id, job.id
       end
 
-      should 'Ignore future dated jobs' do
+      it 'Ignore future dated jobs' do
         @job.run_at = Time.now + 1.hour
         @job.save!
         assert_equal nil, RocketJob::Job.next_job(@worker.name)
       end
 
-      should 'Process future dated jobs when time is now' do
+      it 'Process future dated jobs when time is now' do
         @job.run_at = Time.now
         @job.save!
         assert job = RocketJob::Job.next_job(@worker.name), 'Failed to find future job'
         assert_equal @job.id, job.id
       end
 
-      should 'Skip expired jobs' do
+      it 'Skip expired jobs' do
         count           = RocketJob::Job.count
         @job.expires_at = Time.now - 100
         @job.save!
@@ -234,8 +234,8 @@ class JobTest < Minitest::Test
       end
     end
 
-    context '#requeue!' do
-      should 'requeue jobs from dead workers' do
+    describe '#requeue!' do
+      it 'requeue jobs from dead workers' do
         worker_name      = 'server:12345'
         @job.worker_name = worker_name
         @job.start!
@@ -249,8 +249,8 @@ class JobTest < Minitest::Test
       end
     end
 
-    context '#requeue' do
-      should 'requeue jobs from dead workers' do
+    describe '#requeue' do
+      it 'requeue jobs from dead workers' do
         worker_name      = 'server:12345'
         @job.worker_name = worker_name
         @job.start!
@@ -266,8 +266,8 @@ class JobTest < Minitest::Test
       end
     end
 
-    context '.requeue_dead_worker' do
-      should 'requeue jobs from dead workers' do
+    describe '.requeue_dead_worker' do
+      it 'requeue jobs from dead workers' do
         worker_name      = 'server:12345'
         @job.worker_name = worker_name
         @job.start!
@@ -289,8 +289,8 @@ class JobTest < Minitest::Test
       end
     end
 
-    context '#retry!' do
-      should 'retry failed jobs' do
+    describe '#retry!' do
+      it 'retry failed jobs' do
         worker_name      = 'server:12345'
         @job.worker_name = worker_name
         @job.start!
@@ -299,10 +299,12 @@ class JobTest < Minitest::Test
 
         @job.fail!(worker_name, 'oh no')
         assert @job.failed?
+        assert_equal 'oh no', @job.exception.message
 
         @job.retry!
         assert @job.queued?
         assert_equal nil, @job.worker_name
+        assert_equal nil, @job.exception
       end
     end
 

data/test/job_worker_test.rb

@@ -3,22 +3,22 @@ require_relative 'jobs/test_job'
 
 # Unit Test for RocketJob::Job
 class WorkerTest < Minitest::Test
-  context RocketJob::Job do
+  describe RocketJob::Job do
     [true, false].each do |inline_mode|
-      setup do
+      before do
         RocketJob::Config.inline_mode = inline_mode
 
         @worker = RocketJob::Worker.new
         @worker.started
       end
 
-      teardown do
+      after do
         @job.destroy if @job && !@job.new_record?
         RocketJob::Config.inline_mode = false
       end
 
-      context '.perform_later' do
-        should "process single request (inline_mode=#{inline_mode})" do
+      describe '.perform_later' do
+        it "process single request (inline_mode=#{inline_mode})" do
           @job = Jobs::TestJob.perform_later(1) do |job|
             job.destroy_on_complete = false
           end
@@ -55,8 +55,8 @@ class WorkerTest < Minitest::Test
         end
       end
 
-      context '.later' do
-        should "process non default method (inline_mode=#{inline_mode})" do
+      describe '.later' do
+        it "process non default method (inline_mode=#{inline_mode})" do
           @job = Jobs::TestJob.later(:sum, 23, 45)
           @job.start
           assert_equal false, @job.work(@worker), @job.exception.inspect
@@ -65,16 +65,16 @@ class WorkerTest < Minitest::Test
         end
       end
 
-      context '.perform_now' do
-        should "process perform (inline_mode=#{inline_mode})" do
+      describe '.perform_now' do
+        it "process perform (inline_mode=#{inline_mode})" do
           @job = Jobs::TestJob.perform_now(5)
           assert_equal true, @job.completed?
           assert_equal 6, Jobs::TestJob.result
         end
       end
 
-      context '.now' do
-        should "process non default method (inline_mode=#{inline_mode})" do
+      describe '.now' do
+        it "process non default method (inline_mode=#{inline_mode})" do
           @job = Jobs::TestJob.now(:sum, 23, 45)
           assert_equal true, @job.completed?, @job.inspect
           assert_equal 68, Jobs::TestJob.result
@@ -83,4 +83,4 @@ class WorkerTest < Minitest::Test
 
     end
   end
-end
+end

data/test/test_helper.rb

@@ -4,7 +4,6 @@ require 'yaml'
 require 'minitest/autorun'
 require 'minitest/reporters'
 require 'minitest/stub_any_instance'
-require 'shoulda/context'
 require 'rocketjob'
 require 'awesome_print'
 require 'symmetric-encryption'

data/test/worker_test.rb

@@ -3,8 +3,8 @@ require_relative 'jobs/test_job'
 
 # Unit Test for RocketJob::Worker
 class WorkerTest < Minitest::Test
-  context RocketJob::Worker do
-    setup do
+  describe RocketJob::Worker do
+    before do
       RocketJob::Config.instance.heartbeat_seconds = 0.1
       RocketJob::Config.instance.max_poll_seconds  = 0.1
 
@@ -18,19 +18,19 @@ class WorkerTest < Minitest::Test
       )
     end
 
-    teardown do
+    after do
       @job.destroy if @job && !@job.new_record?
       @worker.destroy if @worker && !@worker.new_record?
     end
 
-    context '.config' do
-      should 'support multiple databases' do
+    describe '.config' do
+      it 'support multiple databases' do
         assert_equal 'test_rocketjob', RocketJob::Job.collection.db.name
       end
     end
 
-    context '#run' do
-      should 'run a worker' do
+    describe '#run' do
+      it 'run a worker' do
         Thread.new do
           sleep 1
           @worker.stop!
@@ -40,12 +40,12 @@ class WorkerTest < Minitest::Test
       end
     end
 
-    context '#zombie?' do
-      setup do
+    describe '#zombie?' do
+      before do
         RocketJob::Config.instance.heartbeat_seconds = 1
       end
 
-      should 'when not a zombie' do
+      it 'when not a zombie' do
         @worker.build_heartbeat(
           updated_at:      2.seconds.ago,
           current_threads: 3
@@ -56,7 +56,7 @@ class WorkerTest < Minitest::Test
         assert_equal true, @worker.zombie?(1)
       end
 
-      should 'when a zombie' do
+      it 'when a zombie' do
         @worker.build_heartbeat(
           updated_at:      1.hour.ago,
           current_threads: 5
@@ -66,12 +66,12 @@ class WorkerTest < Minitest::Test
       end
     end
 
-    context '.destroy_zombies' do
-      setup do
+    describe '.destroy_zombies' do
+      before do
         RocketJob::Config.instance.heartbeat_seconds = 1
       end
 
-      should 'when not a zombie' do
+      it 'when not a zombie' do
         @worker.build_heartbeat(
           updated_at:      2.seconds.ago,
           current_threads: 3
@@ -81,7 +81,7 @@ class WorkerTest < Minitest::Test
         assert_equal true, RocketJob::Worker.where(id: @worker.id).exist?
       end
 
-      should 'when a zombie' do
+      it 'when a zombie' do
         @worker.build_heartbeat(
           updated_at:      10.seconds.ago,
           current_threads: 3

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rocketjob
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Reid Morrison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-27 00:00:00.000000000 Z
+date: 2015-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aasm
@@ -160,7 +160,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Next generation background job processing system for Ruby, JRuby and Rubinius