diff options
| author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-05-09 14:54:27 +0000 |
|---|---|---|
| committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-05-09 14:54:27 +0000 |
| commit | 2c240c5e49e618f769d8c8082ab9c4d088f68411 (patch) | |
| tree | 440ca32c67b210c68ea9dd70bf3130a4f92e1855 /test | |
| parent | 4c1f8acd2ac14ffce1e1d9f414c700f293a7bdc6 (diff) | |
merge revision(s) 40612,40614: [Backport #8025]
* class.c (rb_mod_included_modules): should not include the original
module itself. [ruby-core:53158] [Bug #8025]
* class.c (rb_mod_included_modules): should not include non-modules.
[ruby-core:53158] [Bug #8025]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@40627 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
| -rw-r--r-- | test/ruby/test_module.rb | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/test/ruby/test_module.rb b/test/ruby/test_module.rb index e7523f6a1e..7dd5cce90f 100644 --- a/test/ruby/test_module.rb +++ b/test/ruby/test_module.rb @@ -1508,6 +1508,21 @@ class TestModule < Test::Unit::TestCase assert_nothing_raised(NoMethodError) {a.send :foo} end + def test_prepend_included_modules + bug8025 = '[ruby-core:53158] [Bug #8025]' + mixin = labeled_module("mixin") + c = labeled_module("c") {prepend mixin} + im = c.included_modules + assert_not_include(im, c, bug8025) + assert_include(im, mixin, bug8025) + c1 = labeled_class("c1") {prepend mixin} + c2 = labeled_class("c2", c1) + im = c2.included_modules + assert_not_include(im, c1, bug8025) + assert_not_include(im, c2, bug8025) + assert_include(im, mixin, bug8025) + end + def test_class_variables m = Module.new m.class_variable_set(:@@foo, 1) |