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

@@ -4,112 +4,120 @@
   module Job
     # Unit Test for RocketJob::Job
     class CallbacksTest < Minitest::Test
       # This job adds each callback as they run into an array
       class BeforePerformJob < RocketJob::Job
+        field :call_list, type: Array, default: []
+
         before_perform do
-          arguments.first << 'before_perform_block'
+          call_list << 'before_perform_block'
         end
 
         before_perform :before_perform_method
 
-        def perform(list)
-          list << 'perform'
+        def perform
+          call_list << 'perform'
         end
 
         private
 
         def before_perform_method
-          arguments.first << 'before_perform_method'
+          call_list << 'before_perform_method'
         end
 
       end
 
       # This job adds each callback as they run into an array
       class AfterPerformJob < RocketJob::Job
+        field :call_list, type: Array, default: []
+
         after_perform do
-          arguments.first << 'after_perform_block'
+          call_list << 'after_perform_block'
         end
 
         after_perform :after_perform_method
 
-        def perform(list)
-          list << 'perform'
+        def perform
+          call_list << 'perform'
         end
 
         private
 
         def after_perform_method
-          arguments.first << 'after_perform_method'
+          call_list << 'after_perform_method'
         end
 
       end
 
       # This job adds each callback as they run into an array
       class AroundPerformJob < RocketJob::Job
+        field :call_list, type: Array, default: []
+
         around_perform do |job, block|
-          arguments.first << 'around_perform_block_before'
+          call_list << 'around_perform_block_before'
           block.call
-          arguments.first << 'around_perform_block_after'
+          call_list << 'around_perform_block_after'
         end
 
         around_perform :around_perform_method
 
-        def perform(list)
-          list << 'perform'
+        def perform
+          call_list << 'perform'
         end
 
         private
 
         def around_perform_method
-          arguments.first << 'around_perform_method_before'
+          call_list << 'around_perform_method_before'
           yield
-          arguments.first << 'around_perform_method_after'
+          call_list << 'around_perform_method_after'
         end
 
       end
 
       # This job adds each callback as they run into an array
       class CombinedPerformJob < RocketJob::Job
+        field :call_list, type: Array, default: []
+
         before_perform do
-          arguments.first << 'before_perform_block'
+          call_list << 'before_perform_block'
         end
 
         after_perform do
-          arguments.first << 'after_perform_block'
+          call_list << 'after_perform_block'
         end
 
         around_perform do |job, block|
-          arguments.first << 'around_perform_block_before'
+          call_list << 'around_perform_block_before'
           block.call
-          arguments.first << 'around_perform_block_after'
+          call_list << 'around_perform_block_after'
         end
 
         before_perform :before_perform_method
 
         around_perform :around_perform_method
 
         after_perform :after_perform_method
 
-        def perform(list)
-          list << 'perform'
+        def perform
+          call_list << 'perform'
         end
 
         private
 
         def before_perform_method
-          arguments.first << 'before_perform_method'
+          call_list << 'before_perform_method'
         end
 
         def around_perform_method(&block)
-          arguments.first << 'around_perform_method_before'
+          call_list << 'around_perform_method_before'
           block.call
-          arguments.first << 'around_perform_method_after'
+          call_list << 'around_perform_method_after'
         end
 
         def after_perform_method
-          arguments.first << 'after_perform_method'
+          call_list << 'after_perform_method'
         end
 
       end
 
       describe RocketJob::Plugins::Job::Callbacks do
@@ -117,44 +125,44 @@
           @job.destroy if @job && !@job.new_record?
         end
 
         describe '#before_perform' do
           it 'runs blocks and functions' do
-            @job = BeforePerformJob.new(arguments: [[]])
+            @job = BeforePerformJob.new
             @job.perform_now
             assert @job.completed?, @job.attributes.ai
             expected = %w(before_perform_block before_perform_method perform)
-            assert_equal expected, @job.arguments.first, 'Sequence of before_perform callbacks is incorrect'
+            assert_equal expected, @job.call_list, 'Sequence of before_perform callbacks is incorrect'
           end
         end
 
         describe '#after_perform' do
           it 'runs blocks and functions' do
-            @job = AfterPerformJob.new(arguments: [[]])
+            @job = AfterPerformJob.new
             @job.perform_now
             assert @job.completed?, @job.attributes.ai
             expected = %w(perform after_perform_method after_perform_block)
-            assert_equal expected, @job.arguments.first, 'Sequence of after_perform callbacks is incorrect'
+            assert_equal expected, @job.call_list, 'Sequence of after_perform callbacks is incorrect'
           end
         end
 
         describe '#around_perform' do
           it 'runs blocks and functions' do
-            @job = AroundPerformJob.new(arguments: [[]])
+            @job = AroundPerformJob.new
             @job.perform_now
             assert @job.completed?, @job.attributes.ai
             expected = %w(around_perform_block_before around_perform_method_before perform around_perform_method_after around_perform_block_after)
-            assert_equal expected, @job.arguments.first, 'Sequence of around_perform callbacks is incorrect'
+            assert_equal expected, @job.call_list, 'Sequence of around_perform callbacks is incorrect'
           end
         end
 
         describe 'all callbacks' do
           it 'runs them in the right order' do
-            @job = CombinedPerformJob.new(arguments: [[]])
+            @job = CombinedPerformJob.new
             @job.perform_now
             assert @job.completed?, @job.attributes.ai
             expected = %w(before_perform_block around_perform_block_before before_perform_method around_perform_method_before perform after_perform_method around_perform_method_after around_perform_block_after after_perform_block)
-            assert_equal expected, @job.arguments.first, 'Sequence of around_perform callbacks is incorrect'
+            assert_equal expected, @job.call_list, 'Sequence of around_perform callbacks is incorrect'
           end
         end
 
       end
     end