diff options
author | Jon Leighton <j@jonathanleighton.com> | 2012-07-13 21:20:12 +0100 |
---|---|---|
committer | Jon Leighton <j@jonathanleighton.com> | 2012-07-13 21:20:26 +0100 |
commit | 7fa9cb58c6e3b9311f0306173c48874ace7a6b04 (patch) | |
tree | 5fccd177bb0f63279e4f6ced60c1f4ac8b5f28ff /activerecord/test | |
parent | 8baaa452fd8b3688719573977f05b89a9f5b1e6d (diff) | |
download | rails-7fa9cb58c6e3b9311f0306173c48874ace7a6b04.tar.gz rails-7fa9cb58c6e3b9311f0306173c48874ace7a6b04.tar.bz2 rails-7fa9cb58c6e3b9311f0306173c48874ace7a6b04.zip |
fix association :extend option
Diffstat (limited to 'activerecord/test')
-rw-r--r-- | activerecord/test/cases/associations/extension_test.rb | 2 | ||||
-rw-r--r-- | activerecord/test/cases/relation_test.rb | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/activerecord/test/cases/associations/extension_test.rb b/activerecord/test/cases/associations/extension_test.rb index 91fd17e572..917fe6cf52 100644 --- a/activerecord/test/cases/associations/extension_test.rb +++ b/activerecord/test/cases/associations/extension_test.rb @@ -72,6 +72,6 @@ class AssociationsExtensionsTest < ActiveRecord::TestCase def extension_name(model) builder = ActiveRecord::Associations::Builder::HasMany.new(model, :association_name, nil, {}) { } builder.send(:wrap_block_extension) - builder.options[:extend].first.name + builder.extension_module.name end end diff --git a/activerecord/test/cases/relation_test.rb b/activerecord/test/cases/relation_test.rb index 89f818a689..034339e413 100644 --- a/activerecord/test/cases/relation_test.rb +++ b/activerecord/test/cases/relation_test.rb @@ -191,11 +191,14 @@ module ActiveRecord end test 'extending!' do - mod = Module.new + mod, mod2 = Module.new, Module.new assert relation.extending!(mod).equal?(relation) - assert [mod], relation.extending_values + assert_equal [mod], relation.extending_values assert relation.is_a?(mod) + + relation.extending!(mod2) + assert_equal [mod, mod2], relation.extending_values end test 'extending! with empty args' do |