2 files changed, 20 insertions, 16 deletions
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
diff --git a/activejob/test/jobs/kwargs_job.rb b/activejob/test/jobs/kwargs_job.rb
new file mode 100644
index 0000000000..2df17d15ae
--- /dev/null
+++ b/activejob/test/jobs/kwargs_job.rb
@@ -0,0 +1,7 @@
+require_relative '../support/job_buffer'
+
+class KwargsJob < ActiveJob::Base
+  def perform(argument: 1)
+    JobBuffer.add("Job with argument: #{argument}")
+  end
+end