summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-11-30 15:19:02 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-11-30 15:19:02 +0000
commit4c5c26cec13e0c604d4bc50109776394f21ea362 (patch)
tree16351efdf5e3908ef696ea27d9409675f748d689
parentf6f453438242fe724dcf0d2d5c968a5861820848 (diff)
Fix 33906: remove JSON::Ext::Generator::GeneratorMethods::String.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33910 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--test/ruby/test_module.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/test/ruby/test_module.rb b/test/ruby/test_module.rb
index 1347545fa7..892ab9f593 100644
--- a/test/ruby/test_module.rb
+++ b/test/ruby/test_module.rb
@@ -203,6 +203,7 @@ class TestModule < Test::Unit::TestCase
ancestors = Object.ancestors
mixins = ancestors - [Object, Kernel, BasicObject]
+ mixins << JSON::Ext::Generator::GeneratorMethods::String if defined?(JSON::Ext::Generator::GeneratorMethods::String)
assert_equal([Object, Kernel, BasicObject], ancestors - mixins)
assert_equal([String, Comparable, Object, Kernel, BasicObject], String.ancestors - mixins)
end
@@ -263,6 +264,7 @@ class TestModule < Test::Unit::TestCase
assert_equal([Mixin], User.included_modules)
mixins = Object.included_modules - [Kernel]
+ mixins << JSON::Ext::Generator::GeneratorMethods::String if defined?(JSON::Ext::Generator::GeneratorMethods::String)
assert_equal([Kernel], Object.included_modules - mixins)
assert_equal([Comparable, Kernel], String.included_modules - mixins)
end