2 files changed, 15 insertions, 18 deletions
diff --git a/activejob/test/integration/queuing_test.rb b/activejob/test/integration/queuing_test.rb
index 219be11509..38874b51a8 100644
--- a/activejob/test/integration/queuing_test.rb
+++ b/activejob/test/integration/queuing_test.rb
@@ -3,13 +3,13 @@ require 'jobs/logging_job'
 require 'active_support/core_ext/numeric/time'
 
 class QueuingTest < ActiveSupport::TestCase
-  test 'should run jobs enqueued on a listenting queue' do
+  test 'should run jobs enqueued on a listening queue' do
     TestJob.perform_later @id
     wait_for_jobs_to_finish_for(5.seconds)
     assert job_executed
   end
 
-  test 'should not run jobs queued on a non-listenting queue' do
+  test 'should not run jobs queued on a non-listening queue' do
     skip if adapter_is?(:inline) || adapter_is?(:sucker_punch)
     old_queue = TestJob.queue_name
 
diff --git a/activejob/test/jobs/callback_job.rb b/activejob/test/jobs/callback_job.rb
index 056dd073e8..891ed9464e 100644
--- a/activejob/test/jobs/callback_job.rb
+++ b/activejob/test/jobs/callback_job.rb
@@ -1,12 +1,21 @@
 class CallbackJob < ActiveJob::Base
   before_perform ->(job) { job.history << "CallbackJob ran before_perform" }
-  after_perform  ->(job) { job.history << "CallbackJob ran after_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"  }
+  after_enqueue ->(job) { job.history << "CallbackJob ran after_enqueue" }
 
-  around_perform :around_perform
-  around_enqueue :around_enqueue
+  around_perform do |job, block|
+    job.history << "CallbackJob ran around_perform_start"
+    block.call
+    job.history << "CallbackJob ran around_perform_stop"
+  end
+
+  around_enqueue do |job, block|
+    job.history << "CallbackJob ran around_enqueue_start"
+    block.call
+    job.history << "CallbackJob ran around_enqueue_stop"
+  end
 
 
   def perform(person = "david")
@@ -17,16 +26,4 @@ class CallbackJob < ActiveJob::Base
     @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