Fix marshal with autoloading for nested class/module

activesupport/lib/active_support/core_ext/marshal.rb

@@ -3,7 +3,7 @@ module MarshalWithAutoloading # :nodoc:
     def load(source)
       super(source)
     rescue ArgumentError, NameError => exc
-      if exc.message.match(%r|undefined class/module (.+)|)
+      if exc.message.match(%r|undefined class/module (.+?)(::)?\z|)
         # try loading the class/module
         loaded = $1.constantize
 

activesupport/test/core_ext/marshal_test.rb

@@ -29,7 +29,12 @@ def teardown
     ActiveSupport::Dependencies.clear
 
     with_autoloading_fixtures do
-      assert_kind_of EM, Marshal.load(dumped)
+      object = nil
+      assert_nothing_raised do
+        object = Marshal.load(dumped)
+      end
+
+      assert_kind_of EM, object
     end
   end
 
@@ -43,7 +48,12 @@ def teardown
     ActiveSupport::Dependencies.clear
 
     with_autoloading_fixtures do
-      assert_kind_of ClassFolder::ClassFolderSubclass, Marshal.load(dumped)
+      object = nil
+      assert_nothing_raised do
+        object = Marshal.load(dumped)
+      end
+
+      assert_kind_of ClassFolder::ClassFolderSubclass, object
     end
   end
 
@@ -128,7 +138,12 @@ class SomeClass
       ActiveSupport::Dependencies.clear
 
       with_autoloading_fixtures do
-        assert_kind_of EM, Marshal.load(f)
+        object = nil
+        assert_nothing_raised do
+          object = Marshal.load(f)
+        end
+
+        assert_kind_of EM, object
       end
     end
   end