From c073ba339a6820625718f7320989cfa527534563 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Thu, 22 May 2014 19:33:23 +0200 Subject: Add callbacks, implement instrumentation as callbacks, and have the enqueue methods return a job instance --- test/cases/callbacks_test.rb | 23 +++++++++++++++++++++++ test/cases/queuing_test.rb | 15 +++++++++++++++ test/jobs/callback_job.rb | 32 ++++++++++++++++++++++++++++++++ 3 files changed, 70 insertions(+) create mode 100644 test/cases/callbacks_test.rb create mode 100644 test/jobs/callback_job.rb (limited to 'test') diff --git a/test/cases/callbacks_test.rb b/test/cases/callbacks_test.rb new file mode 100644 index 0000000000..391c7e87c4 --- /dev/null +++ b/test/cases/callbacks_test.rb @@ -0,0 +1,23 @@ +require 'helper' +require 'active_job/parameters' +require 'jobs/callback_job' + +require 'active_support/core_ext/object/inclusion' + +class CallbacksTest < ActiveSupport::TestCase + test 'perform callbacks' do + performed_callback_job = CallbackJob.new.tap { |j| j.perform_with_hooks } + assert "CallbackJob ran before_perform".in? performed_callback_job.history + assert "CallbackJob ran after_perform".in? performed_callback_job.history + assert "CallbackJob ran around_perform_start".in? performed_callback_job.history + assert "CallbackJob ran around_perform_stop".in? performed_callback_job.history + end + + test 'enqueue callbacks' do + enqueued_callback_job = CallbackJob.enqueue + assert "CallbackJob ran before_enqueue".in? enqueued_callback_job.history + assert "CallbackJob ran after_enqueue".in? enqueued_callback_job.history + assert "CallbackJob ran around_enqueue_start".in? enqueued_callback_job.history + assert "CallbackJob ran around_enqueue_stop".in? enqueued_callback_job.history + end +end diff --git a/test/cases/queuing_test.rb b/test/cases/queuing_test.rb index 23df35a8df..029f60f246 100644 --- a/test/cases/queuing_test.rb +++ b/test/cases/queuing_test.rb @@ -26,4 +26,19 @@ class QueuingTest < ActiveSupport::TestCase skip end end + + test 'job returned by enqueue has the arguments available' do + job = HelloJob.enqueue "Jamie" + assert_equal [ "Jamie" ], job.arguments + end + + + test 'job returned by enqueue_at has the timestamp available' do + begin + job = HelloJob.enqueue_at Time.utc(2014, 1, 1) + assert_equal Time.utc(2014, 1, 1), job.enqueued_at + rescue NotImplementedError + skip + end + end end diff --git a/test/jobs/callback_job.rb b/test/jobs/callback_job.rb new file mode 100644 index 0000000000..056dd073e8 --- /dev/null +++ b/test/jobs/callback_job.rb @@ -0,0 +1,32 @@ +class CallbackJob < ActiveJob::Base + before_perform ->(job) { job.history << "CallbackJob ran before_perform" } + after_perform ->(job) { job.history << "CallbackJob ran after_perform" } + + before_enqueue ->(job) { job.history << "CallbackJob ran before_enqueue" } + after_enqueue ->(job) { job.history << "CallbackJob ran after_enqueue" } + + around_perform :around_perform + around_enqueue :around_enqueue + + + def perform(person = "david") + # NOTHING! + end + + def history + @history ||= [] + end + + # FIXME: Not sure why these can't be declared inline like before/after + def around_perform + history << "CallbackJob ran around_perform_start" + yield + history << "CallbackJob ran around_perform_stop" + end + + def around_enqueue + history << "CallbackJob ran around_enqueue_start" + yield + history << "CallbackJob ran around_enqueue_stop" + end +end -- cgit v1.2.3