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

Currently we sometimes find a redundant begin block in code review
(e.g. https://github.com/rails/rails/pull/33604#discussion_r209784205).

I'd like to enable `Style/RedundantBegin` cop to avoid that, since
rescue/else/ensure are allowed inside do/end blocks in Ruby 2.5
(https://bugs.ruby-lang.org/issues/12906), so we'd probably meets with
that situation than before.

1 files changed, 23 insertions, 27 deletions

diff --git a/activerecord/test/cases/associations/required_test.rb b/activerecord/test/cases/associations/required_test.rb
index 65a3bb5efe..c7a78e6bc4 100644
--- a/activerecord/test/cases/associations/required_test.rb
+++ b/activerecord/test/cases/associations/required_test.rb
@@ -25,20 +25,18 @@ class RequiredAssociationsTest < ActiveRecord::TestCase
   end
 
   test "belongs_to associations can be optional by default" do
-    begin
-      original_value = ActiveRecord::Base.belongs_to_required_by_default
-      ActiveRecord::Base.belongs_to_required_by_default = false
+    original_value = ActiveRecord::Base.belongs_to_required_by_default
+    ActiveRecord::Base.belongs_to_required_by_default = false
 
-      model = subclass_of(Child) do
-        belongs_to :parent, inverse_of: false,
-          class_name: "RequiredAssociationsTest::Parent"
-      end
-
-      assert model.new.save
-      assert model.new(parent: Parent.new).save
-    ensure
-      ActiveRecord::Base.belongs_to_required_by_default = original_value
+    model = subclass_of(Child) do
+      belongs_to :parent, inverse_of: false,
+        class_name: "RequiredAssociationsTest::Parent"
     end
+
+    assert model.new.save
+    assert model.new(parent: Parent.new).save
+  ensure
+    ActiveRecord::Base.belongs_to_required_by_default = original_value
   end
 
   test "required belongs_to associations have presence validated" do
@@ -56,24 +54,22 @@ class RequiredAssociationsTest < ActiveRecord::TestCase
   end
 
   test "belongs_to associations can be required by default" do
-    begin
-      original_value = ActiveRecord::Base.belongs_to_required_by_default
-      ActiveRecord::Base.belongs_to_required_by_default = true
+    original_value = ActiveRecord::Base.belongs_to_required_by_default
+    ActiveRecord::Base.belongs_to_required_by_default = true
 
-      model = subclass_of(Child) do
-        belongs_to :parent, inverse_of: false,
-          class_name: "RequiredAssociationsTest::Parent"
-      end
+    model = subclass_of(Child) do
+      belongs_to :parent, inverse_of: false,
+        class_name: "RequiredAssociationsTest::Parent"
+    end
 
-      record = model.new
-      assert_not record.save
-      assert_equal ["Parent must exist"], record.errors.full_messages
+    record = model.new
+    assert_not record.save
+    assert_equal ["Parent must exist"], record.errors.full_messages
 
-      record.parent = Parent.new
-      assert record.save
-    ensure
-      ActiveRecord::Base.belongs_to_required_by_default = original_value
-    end
+    record.parent = Parent.new
+    assert record.save
+  ensure
+    ActiveRecord::Base.belongs_to_required_by_default = original_value
   end
 
   test "has_one associations are not required by default" do