From 640b53841ae48e8122baae870308b6a31517f58f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?=
 <rafael@rubyonrails.org>
Date: Fri, 7 Jan 2022 23:23:39 +0000
Subject: [PATCH] Fix leaky test

This test was changing the user of Person and affecting other tests.
We need to reset the user after the test has run.
---
 Gemfile                 | 2 ++
 test/cases/base_test.rb | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/Gemfile b/Gemfile
index af03e0e815..f011e1e23f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -15,6 +15,8 @@ gem "rubocop-packaging"
 gem "rubocop-performance"
 gem "rubocop-rails"
 
+gem "minitest-bisect"
+
 gemspec
 
 platform :mri do
diff --git a/test/cases/base_test.rb b/test/cases/base_test.rb
index 9ed1ccc7cb..f0302726aa 100644
--- a/test/cases/base_test.rb
+++ b/test/cases/base_test.rb
@@ -306,6 +306,7 @@ def test_user_reader_uses_superclass_user_until_written
     # Superclass is Object so returns nil.
     assert_nil ActiveResource::Base.user
     assert_nil Class.new(ActiveResource::Base).user
+    person_user = Person.user
     Person.user = "anonymous".dup
 
     # Subclass uses superclass user.
@@ -338,6 +339,8 @@ def test_user_reader_uses_superclass_user_until_written
 
     fruit.user = "client"
     assert_equal fruit.user, apple.user, "subclass did not adopt changes from parent class"
+  ensure
+    Person.user = person_user
   end
 
   def test_password_reader_uses_superclass_password_until_written