Consolidate and give context to after callback deprecation

The existing message only mentioned one type of before/after callback,
but the config was named generally. That mismatch is confusing and users
wouldn't necessarily know what the total effect of the config would be.

So instead of handwriting the deprecation warning in the specific instances,
consolidate it in one place and give the appropriate context. That context
is the above, but also that users shouldn't update their app config,
they should uncomment the line in the new defaults file, which now also
has more context.

I'm not totally convinced that we can't move this to when
`after_enqueue`/`after_perform` is called in the job class. Doesn't
seem worth it to blare this after every job enqueue/perform, when we
the score at boot time.

cc @Edouard-chin

Author: kaspth

activejob/lib/active_job/callbacks.rb

@@ -163,6 +163,16 @@ def after_enqueue(*filters, &blk)
       def around_enqueue(*filters, &blk)
         set_callback(:enqueue, :around, *filters, &blk)
       end
+
+      def warn_against_after_callbacks_execution_deprecation(callbacks) # :nodoc:
+        if !skip_after_callbacks_if_terminated && callbacks.any? { |c| c.kind == :after }
+          ActiveSupport::Deprecation.warn(<<~EOM)
+            In Rails 6.2, `after_enqueue`/`after_perform` callbacks no longer run if `before_enqueue`/`before_perform` respectively halts with `throw :abort`.
+            To enable this behavior, uncomment the `config.active_job.skip_after_callbacks_if_terminated` config
+            in the new 6.1 framework defaults initializer.
+          EOM
+        end
+      end
     end
   end
 end

activejob/lib/active_job/enqueuing.rb

@@ -63,14 +63,8 @@ def enqueue(options = {})
       if successfully_enqueued
         self
       else
-        if !self.class.skip_after_callbacks_if_terminated && _enqueue_callbacks.any? { |c| c.kind == :after }
-          ActiveSupport::Deprecation.warn(<<~EOM)
-            In Rails 6.2, ActiveJob's `after_enqueue` callbacks will no longer run in case the
-            callback chain is halted (i.e. `throw(:abort)` is thrown in a before_enqueue callback).
-            To enable this behaviour right now, add in your application configuration file
-            `config.active_job.skip_after_callbacks_if_terminated = true`.
-          EOM
-        end
+        self.class.warn_against_after_callbacks_execution_deprecation(_enqueue_callbacks)
+
         if self.class.return_false_on_aborted_enqueue
           false
         else

activejob/lib/active_job/execution.rb

@@ -39,18 +39,10 @@ def perform_now
 
       run_callbacks :perform do
         perform(*arguments)
-
         successfully_performed = true
       end
 
-      if !successfully_performed && !self.class.skip_after_callbacks_if_terminated && _perform_callbacks.any? { |c| c.kind == :after }
-        ActiveSupport::Deprecation.warn(<<~EOM)
-          In Rails 6.2, ActiveJob's `after_perform` callbacks will no longer run in case the
-          callback chain is halted (i.e. `throw(:abort)` is thrown in a before_perform callback).
-          To enable this behaviour right now, add in your application configuration file
-          `config.active_job.skip_after_callbacks_if_terminated = true`.
-        EOM
-      end
+      self.class.warn_against_after_callbacks_execution_deprecation(_perform_callbacks) unless successfully_performed
       successfully_performed
     rescue => exception
       rescue_with_handler(exception) || raise

activejob/test/cases/callbacks_test.rb

@@ -65,7 +65,7 @@ class CallbacksTest < ActiveSupport::TestCase
     ActiveJob::Base.skip_after_callbacks_if_terminated = false
     reload_job
     job = AbortBeforeEnqueueJob.new
-    assert_deprecated(/`after_enqueue` callbacks will no longer run/) do
+    assert_deprecated(/`after_enqueue`\/`after_perform` callbacks no longer run/) do
       job.enqueue
     end
 
@@ -107,7 +107,7 @@ class CallbacksTest < ActiveSupport::TestCase
     ActiveJob::Base.skip_after_callbacks_if_terminated = false
     reload_job
     job = AbortBeforeEnqueueJob.new
-    assert_deprecated(/`after_perform` callbacks will no longer run/) do
+    assert_deprecated(/`after_enqueue`\/`after_perform` callbacks no longer run/) do
       job.perform_now
     end
 

railties/lib/rails/generators/rails/app/templates/config/initializers/new_framework_defaults_6_1.rb.tt

@@ -12,6 +12,8 @@
 # Track Active Storage variants in the database.
 # Rails.application.config.active_storage.track_variants = true
 
+# Stop executing `after_enqueue`/`after_perform` callbacks if
+# `before_enqueue`/`before_perform` respectively halts with `throw :abort`.
 # Rails.application.config.active_job.skip_after_callbacks_if_terminated = true
 
 # Specify cookies SameSite protection level: either :none, :lax, or :strict.