Merge pull request #33992 from kirs/enqueue-return-false

Make AJ::Base#enqueue return false if the job wasn't enqueued

1 files changed, 29 insertions, 0 deletions

diff --git a/activejob/test/cases/callbacks_test.rb b/activejob/test/cases/callbacks_test.rb
index df6ce16858..267d58a7c8 100644
--- a/activejob/test/cases/callbacks_test.rb
+++ b/activejob/test/cases/callbacks_test.rb
@@ -2,6 +2,7 @@
 
 require "helper"
 require "jobs/callback_job"
+require "jobs/abort_before_enqueue_job"
 
 require "active_support/core_ext/object/inclusion"
 
@@ -22,4 +23,32 @@ class CallbacksTest < ActiveSupport::TestCase
     assert "CallbackJob ran around_enqueue_start".in? enqueued_callback_job.history
     assert "CallbackJob ran around_enqueue_stop".in? enqueued_callback_job.history
   end
+
+  test "#enqueue returns false when before_enqueue aborts callback chain and return_false_on_aborted_enqueue = true" do
+    begin
+      prev = ActiveJob::Base.return_false_on_aborted_enqueue
+      ActiveJob::Base.return_false_on_aborted_enqueue = true
+      assert_equal false, AbortBeforeEnqueueJob.new.enqueue
+    ensure
+      ActiveJob::Base.return_false_on_aborted_enqueue = prev
+    end
+  end
+
+  test "#enqueue returns self when before_enqueue aborts callback chain and return_false_on_aborted_enqueue = false" do
+    begin
+      prev = ActiveJob::Base.return_false_on_aborted_enqueue
+      ActiveJob::Base.return_false_on_aborted_enqueue = false
+      job = AbortBeforeEnqueueJob.new
+      assert_deprecated do
+        assert_equal job, job.enqueue
+      end
+    ensure
+      ActiveJob::Base.return_false_on_aborted_enqueue = prev
+    end
+  end
+
+  test "#enqueue returns self when the job was enqueued" do
+    job = CallbackJob.new
+    assert_equal job, job.enqueue
+  end
 end