9 files changed, 38 insertions, 59 deletions
diff --git a/activerecord/lib/active_record/attribute_methods/dirty.rb b/activerecord/lib/active_record/attribute_methods/dirty.rb
index 6aa414ba6b..31c1e687dc 100644
--- a/activerecord/lib/active_record/attribute_methods/dirty.rb
+++ b/activerecord/lib/active_record/attribute_methods/dirty.rb
@@ -50,7 +50,7 @@ module ActiveRecord
         super.tap do
           @previous_mutation_tracker = nil
           clear_mutation_trackers
-          @changed_attributes = ActiveSupport::HashWithIndifferentAccess.new
+          @changed_attributes = HashWithIndifferentAccess.new
         end
       end
 
@@ -70,13 +70,13 @@ module ActiveRecord
 
       def changes_applied
         @previous_mutation_tracker = mutation_tracker
-        @changed_attributes = ActiveSupport::HashWithIndifferentAccess.new
+        @changed_attributes = HashWithIndifferentAccess.new
         clear_mutation_trackers
       end
 
       def clear_changes_information
         @previous_mutation_tracker = nil
-        @changed_attributes = ActiveSupport::HashWithIndifferentAccess.new
+        @changed_attributes = HashWithIndifferentAccess.new
         forget_attribute_assignments
         clear_mutation_trackers
       end
diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md
index 788ea88752..2fb7f29d73 100644
--- a/activesupport/CHANGELOG.md
+++ b/activesupport/CHANGELOG.md
@@ -1,9 +1,3 @@
-*   Deprecated the top level `HashWithIndifferentAccess` constant.
-
-    Only `ActiveSupport::HashWithIndifferentAccess` should be used now.
-
-    *Robin Dupret* (#27925)
-
 *   Deprecate `.halt_callback_chains_on_return_false`.
 
     *Rafael Mendonça França*
diff --git a/activesupport/lib/active_support/hash_with_indifferent_access.rb b/activesupport/lib/active_support/hash_with_indifferent_access.rb
index 8638667082..79e7feaf47 100644
--- a/activesupport/lib/active_support/hash_with_indifferent_access.rb
+++ b/activesupport/lib/active_support/hash_with_indifferent_access.rb
@@ -316,20 +316,4 @@ module ActiveSupport
   end
 end
 
-class HashWithIndifferentAccess < ActiveSupport::HashWithIndifferentAccess
-  def initialize(*)
-    ActiveSupport::Deprecation.warn "HashWithIndifferentAccess is deprecated!" \
-                                    "Use ActiveSupport::HashWithIndifferentAccess instead."
-    super
-  end
-
-  def self.inherited(*)
-    ActiveSupport::Deprecation.warn "HashWithIndifferentAccess is deprecated!" \
-                                    "Use ActiveSupport::HashWithIndifferentAccess instead."
-    super
-  end
-
-  def encode_with(coder)
-    coder.represent_object(nil, ActiveSupport::HashWithIndifferentAccess.new(self))
-  end
-end
+HashWithIndifferentAccess = ActiveSupport::HashWithIndifferentAccess
diff --git a/activesupport/lib/active_support/testing/autorun.rb b/activesupport/lib/active_support/testing/autorun.rb
index 3108e3e549..a18788f38e 100644
--- a/activesupport/lib/active_support/testing/autorun.rb
+++ b/activesupport/lib/active_support/testing/autorun.rb
@@ -2,8 +2,8 @@ gem "minitest"
 
 require "minitest"
 
-if Minitest.respond_to?(:run_via) && !Minitest.run_via[:rails]
-  Minitest.run_via[:ruby] = true
+if Minitest.respond_to?(:run_via) && !Minitest.run_via.set?
+  Minitest.run_via = :ruby
 end
 
 Minitest.autorun
diff --git a/activesupport/test/core_ext/hash_ext_test.rb b/activesupport/test/core_ext/hash_ext_test.rb
index 042bb60a22..05813ad388 100644
--- a/activesupport/test/core_ext/hash_ext_test.rb
+++ b/activesupport/test/core_ext/hash_ext_test.rb
@@ -8,8 +8,6 @@ require "active_support/core_ext/object/deep_dup"
 require "active_support/inflections"
 
 class HashExtTest < ActiveSupport::TestCase
-  HashWithIndifferentAccess = ActiveSupport::HashWithIndifferentAccess
-
   class IndifferentHash < ActiveSupport::HashWithIndifferentAccess
   end
 
@@ -1080,25 +1078,6 @@ class HashExtTest < ActiveSupport::TestCase
     assert_equal 1, hash[:a]
     assert_equal 3, hash[:b]
   end
-
-  def test_top_level_hash_with_indifferent_access_is_deprecated
-    assert_deprecated do
-      ::HashWithIndifferentAccess.new
-    end
-  end
-
-  def test_top_level_hash_with_indifferent_access_can_be_extended
-    assert_deprecated do
-      Class.new(::HashWithIndifferentAccess)
-    end
-  end
-
-  def test_yaml_encoding_outputs_an_activesupport_namespaced_constant
-    ActiveSupport::Deprecation.silence do
-      instance = ::HashWithIndifferentAccess.new
-      assert_includes instance.to_yaml, "ActiveSupport::HashWithIndifferentAccess"
-    end
-  end
 end
 
 class IWriteMyOwnXML
@@ -1144,8 +1123,6 @@ class HashExtToParamTests < ActiveSupport::TestCase
 end
 
 class HashToXmlTest < ActiveSupport::TestCase
-  HashWithIndifferentAccess = ActiveSupport::HashWithIndifferentAccess
-
   def setup
     @xml_options = { root: :person, skip_instruct: true, indent: 0 }
   end
diff --git a/railties/lib/rails/commands/test/test_command.rb b/railties/lib/rails/commands/test/test_command.rb
index 7bf8f61137..629fb5b425 100644
--- a/railties/lib/rails/commands/test/test_command.rb
+++ b/railties/lib/rails/commands/test/test_command.rb
@@ -11,7 +11,7 @@ module Rails
       def perform(*)
         $LOAD_PATH << Rails::Command.root.join("test")
 
-        Minitest.run_via[:rails] = true
+        Minitest.run_via = :rails
 
         require "active_support/testing/autorun"
       end
diff --git a/railties/lib/rails/generators/rails/plugin/templates/bin/test.tt b/railties/lib/rails/generators/rails/plugin/templates/bin/test.tt
index c0fbb84a93..35a9bf8c8b 100644
--- a/railties/lib/rails/generators/rails/plugin/templates/bin/test.tt
+++ b/railties/lib/rails/generators/rails/plugin/templates/bin/test.tt
@@ -5,6 +5,6 @@ require 'rails/test_unit/minitest_plugin'
 
 Rails::TestUnitReporter.executable = 'bin/test'
 
-Minitest.run_via[:rails] = true
+Minitest.run_via = :rails
 
 require "active_support/testing/autorun"
diff --git a/railties/lib/rails/test_unit/minitest_plugin.rb b/railties/lib/rails/test_unit/minitest_plugin.rb
index 4df3e7f0f2..7d3da6b529 100644
--- a/railties/lib/rails/test_unit/minitest_plugin.rb
+++ b/railties/lib/rails/test_unit/minitest_plugin.rb
@@ -59,18 +59,18 @@ module Minitest
 
     options[:color] = true
     options[:output_inline] = true
-    options[:patterns] = opts.order! unless run_via[:rake]
+    options[:patterns] = opts.order! unless run_via.rake?
   end
 
   def self.rake_run(patterns) # :nodoc:
-    run_via[:rake] = true
+    self.run_via = :rake unless run_via.set?
     ::Rails::TestRequirer.require_files(patterns)
     autorun
   end
 
   module RunRespectingRakeTestopts
     def run(args = [])
-      if run_via[:rake]
+      if run_via.rake?
         args = Shellwords.split(ENV["TESTOPTS"] || "")
       end
 
@@ -87,7 +87,7 @@ module Minitest
 
     # If run via `ruby` we've been passed the files to run directly, or if run
     # via `rake` then they have already been eagerly required.
-    unless run_via[:ruby] || run_via[:rake]
+    unless run_via.ruby? || run_via.rake?
       ::Rails::TestRequirer.require_files(options[:patterns])
     end
 
@@ -102,7 +102,31 @@ module Minitest
     reporter << ::Rails::TestUnitReporter.new(options[:io], options)
   end
 
-  mattr_accessor(:run_via) { Hash.new }
+  def self.run_via=(runner)
+    if run_via.set?
+      raise ArgumentError, "run_via already assigned"
+    else
+      run_via.runner = runner
+    end
+  end
+
+  class RunVia
+    attr_accessor :runner
+    alias set? runner
+
+    # Backwardscompatibility with Rails 5.0 generated plugin test scripts.
+    alias []= runner=
+
+    def ruby?
+      runner == :ruby
+    end
+
+    def rake?
+      runner == :rake
+    end
+  end
+
+  mattr_reader(:run_via) { RunVia.new }
 end
 
 # Put Rails as the first plugin minitest initializes so other plugins
diff --git a/tools/test.rb b/tools/test.rb
index ce546b382d..71349a5974 100644
--- a/tools/test.rb
+++ b/tools/test.rb
@@ -16,5 +16,5 @@ end
 
 ActiveSupport::TestCase.extend Rails::LineFiltering
 Rails::TestUnitReporter.executable = "bin/test"
-Minitest.run_via[:rails] = true
+Minitest.run_via = :rails
 require "active_support/testing/autorun"