Merge pull request #29294 from gsamokovarov/attributes-default

Introduce mattr_accessor default option

2 files changed, 4 insertions, 3 deletions

diff --git a/railties/lib/rails/info.rb b/railties/lib/rails/info.rb
index fc064dac32..db08d578c0 100644
--- a/railties/lib/rails/info.rb
+++ b/railties/lib/rails/info.rb
@@ -5,8 +5,9 @@ module Rails
   # Rails::InfoController responses. These include the active Rails version,
   # Ruby version, Rack version, and so on.
   module Info
-    mattr_accessor :properties
-    class << (@@properties = [])
+    mattr_accessor :properties, default: []
+
+    class << @@properties
       def names
         map(&:first)
       end
diff --git a/railties/lib/rails/test_unit/minitest_plugin.rb b/railties/lib/rails/test_unit/minitest_plugin.rb
index 7a852d1109..5d0cf1305f 100644
--- a/railties/lib/rails/test_unit/minitest_plugin.rb
+++ b/railties/lib/rails/test_unit/minitest_plugin.rb
@@ -134,7 +134,7 @@ module Minitest
     end
   end
 
-  mattr_reader(:run_via) { RunVia.new }
+  mattr_reader :run_via, default: RunVia.new
 end
 
 # Put Rails as the first plugin minitest initializes so other plugins