aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/test/core_ext/marshal_test.rb
diff options
context:
space:
mode:
authorFumiaki MATSUSHIMA <mtsmfm@gmail.com>2016-03-28 23:04:36 +0900
committerFumiaki MATSUSHIMA <mtsmfm@gmail.com>2016-03-28 23:06:51 +0900
commit37a298b04350425b1055b7bead8560c3d5e7331d (patch)
tree6842b474d7441905a2988f633c2935414a1dcdba /activesupport/test/core_ext/marshal_test.rb
parent475109c517e724c015ee13061416568a7d6b9757 (diff)
downloadrails-37a298b04350425b1055b7bead8560c3d5e7331d.tar.gz
rails-37a298b04350425b1055b7bead8560c3d5e7331d.tar.bz2
rails-37a298b04350425b1055b7bead8560c3d5e7331d.zip
Fix marshal with autoloading for nested class/module
#24150 break autoloading for nested class/module. There is test for nested class but it doesn't work correctly. Following code will autoload `ClassFolder::ClassFolderSubclass` before `Marshal.load`: `assert_kind_of ClassFolder::ClassFolderSubclass, Marshal.load(dumped)`
Diffstat (limited to 'activesupport/test/core_ext/marshal_test.rb')
-rw-r--r--activesupport/test/core_ext/marshal_test.rb21
1 files changed, 18 insertions, 3 deletions
diff --git a/activesupport/test/core_ext/marshal_test.rb b/activesupport/test/core_ext/marshal_test.rb
index 07c0c0d8cb..380f64c6fd 100644
--- a/activesupport/test/core_ext/marshal_test.rb
+++ b/activesupport/test/core_ext/marshal_test.rb
@@ -29,7 +29,12 @@ class MarshalTest < ActiveSupport::TestCase
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 @@ class MarshalTest < ActiveSupport::TestCase
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 MarshalTest < ActiveSupport::TestCase
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