Merge pull request #34764 from kamipo/avoid_redundant_begin

Enable `Style/RedundantBegin` cop to avoid newly adding redundant begin block

1 files changed, 12 insertions, 16 deletions

diff --git a/activejob/test/cases/callbacks_test.rb b/activejob/test/cases/callbacks_test.rb
index 267d58a7c8..895edb34a5 100644
--- a/activejob/test/cases/callbacks_test.rb
+++ b/activejob/test/cases/callbacks_test.rb
@@ -25,26 +25,22 @@ class CallbacksTest < ActiveSupport::TestCase
   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
+    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
 
   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
+    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
 
   test "#enqueue returns self when the job was enqueued" do