Merge pull request #34764 from kamipo/avoid_redundant_begin

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

1 files changed, 14 insertions, 18 deletions

diff --git a/activerecord/test/cases/filter_attributes_test.rb b/activerecord/test/cases/filter_attributes_test.rb
index 47161a547a..2f4c9b0ef7 100644
--- a/activerecord/test/cases/filter_attributes_test.rb
+++ b/activerecord/test/cases/filter_attributes_test.rb
@@ -90,15 +90,13 @@ class FilterAttributesTest < ActiveRecord::TestCase
   end
 
   test "filter_attributes should handle [FILTERED] value properly" do
-    begin
-      User.filter_attributes = ["auth"]
-      user = User.new(token: "[FILTERED]", auth_token: "[FILTERED]")
+    User.filter_attributes = ["auth"]
+    user = User.new(token: "[FILTERED]", auth_token: "[FILTERED]")
 
-      assert_includes user.inspect, "auth_token: [FILTERED]"
-      assert_includes user.inspect, 'token: "[FILTERED]"'
-    ensure
-      User.remove_instance_variable(:@filter_attributes)
-    end
+    assert_includes user.inspect, "auth_token: [FILTERED]"
+    assert_includes user.inspect, 'token: "[FILTERED]"'
+  ensure
+    User.remove_instance_variable(:@filter_attributes)
   end
 
   test "filter_attributes on pretty_print" do
@@ -121,16 +119,14 @@ class FilterAttributesTest < ActiveRecord::TestCase
   end
 
   test "filter_attributes on pretty_print should handle [FILTERED] value properly" do
-    begin
-      User.filter_attributes = ["auth"]
-      user = User.new(token: "[FILTERED]", auth_token: "[FILTERED]")
-      actual = "".dup
-      PP.pp(user, StringIO.new(actual))
+    User.filter_attributes = ["auth"]
+    user = User.new(token: "[FILTERED]", auth_token: "[FILTERED]")
+    actual = "".dup
+    PP.pp(user, StringIO.new(actual))
 
-      assert_includes actual, "auth_token: [FILTERED]"
-      assert_includes actual, 'token: "[FILTERED]"'
-    ensure
-      User.remove_instance_variable(:@filter_attributes)
-    end
+    assert_includes actual, "auth_token: [FILTERED]"
+    assert_includes actual, 'token: "[FILTERED]"'
+  ensure
+    User.remove_instance_variable(:@filter_attributes)
   end
 end