Merge pull request #20267 from kaspth/fix-minitest-constant-clashing

Avoid E constant clashing with Minitest defined version.

1 files changed, 16 insertions, 16 deletions

diff --git a/activesupport/test/core_ext/marshal_test.rb b/activesupport/test/core_ext/marshal_test.rb
index e49330128b..825df439a5 100644
--- a/activesupport/test/core_ext/marshal_test.rb
+++ b/activesupport/test/core_ext/marshal_test.rb
@@ -8,7 +8,7 @@ class MarshalTest < ActiveSupport::TestCase
 
   def teardown
     ActiveSupport::Dependencies.clear
-    remove_constants(:E, :ClassFolder)
+    remove_constants(:EM, :ClassFolder)
   end
 
   test "that Marshal#load still works" do
@@ -22,14 +22,14 @@ class MarshalTest < ActiveSupport::TestCase
   test "that a missing class is autoloaded from string" do
     dumped = nil
     with_autoloading_fixtures do
-      dumped = Marshal.dump(E.new)
+      dumped = Marshal.dump(EM.new)
     end
 
-    remove_constants(:E)
+    remove_constants(:EM)
     ActiveSupport::Dependencies.clear
 
     with_autoloading_fixtures do
-      assert_kind_of E, Marshal.load(dumped)
+      assert_kind_of EM, Marshal.load(dumped)
     end
   end
 
@@ -50,16 +50,16 @@ class MarshalTest < ActiveSupport::TestCase
   test "that more than one missing class is autoloaded" do
     dumped = nil
     with_autoloading_fixtures do
-      dumped = Marshal.dump([E.new, ClassFolder.new])
+      dumped = Marshal.dump([EM.new, ClassFolder.new])
     end
 
-    remove_constants(:E, :ClassFolder)
+    remove_constants(:EM, :ClassFolder)
     ActiveSupport::Dependencies.clear
 
     with_autoloading_fixtures do
       loaded = Marshal.load(dumped)
       assert_equal 2, loaded.size
-      assert_kind_of E, loaded[0]
+      assert_kind_of EM, loaded[0]
       assert_kind_of ClassFolder, loaded[1]
     end
   end
@@ -67,10 +67,10 @@ class MarshalTest < ActiveSupport::TestCase
   test "that a real missing class is causing an exception" do
     dumped = nil
     with_autoloading_fixtures do
-      dumped = Marshal.dump(E.new)
+      dumped = Marshal.dump(EM.new)
     end
 
-    remove_constants(:E)
+    remove_constants(:EM)
     ActiveSupport::Dependencies.clear
 
     assert_raise(NameError) do
@@ -84,10 +84,10 @@ class MarshalTest < ActiveSupport::TestCase
     end
 
     with_autoloading_fixtures do
-      dumped = Marshal.dump([E.new, SomeClass.new])
+      dumped = Marshal.dump([EM.new, SomeClass.new])
     end
 
-    remove_constants(:E)
+    remove_constants(:EM)
     self.class.send(:remove_const, :SomeClass)
     ActiveSupport::Dependencies.clear
 
@@ -96,8 +96,8 @@ class MarshalTest < ActiveSupport::TestCase
         Marshal.load(dumped)
       end
 
-      assert_nothing_raised("E failed to load while we expect only SomeClass to fail loading") do
-        E.new
+      assert_nothing_raised("EM failed to load while we expect only SomeClass to fail loading") do
+        EM.new
       end
 
       assert_raise(NameError, "We expected SomeClass to not be loaded but it is!") do
@@ -109,15 +109,15 @@ class MarshalTest < ActiveSupport::TestCase
   test "loading classes from files trigger autoloading" do
     Tempfile.open("object_serializer_test") do |f|
       with_autoloading_fixtures do
-        Marshal.dump(E.new, f)
+        Marshal.dump(EM.new, f)
       end
 
       f.rewind
-      remove_constants(:E)
+      remove_constants(:EM)
       ActiveSupport::Dependencies.clear
 
       with_autoloading_fixtures do
-        assert_kind_of E, Marshal.load(f)
+        assert_kind_of EM, Marshal.load(f)
       end
     end
   end