From 8d5be98ad72939037f1be52aa4bb4672fff02abb Mon Sep 17 00:00:00 2001 From: Jon Leighton Date: Fri, 13 Apr 2012 12:58:13 +0100 Subject: Make Relation#extending work like other value methods --- activerecord/test/cases/relation_test.rb | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'activerecord/test/cases') diff --git a/activerecord/test/cases/relation_test.rb b/activerecord/test/cases/relation_test.rb index c1063698bd..fdd8e2112e 100644 --- a/activerecord/test/cases/relation_test.rb +++ b/activerecord/test/cases/relation_test.rb @@ -156,7 +156,7 @@ module ActiveRecord @relation ||= Relation.new :a, :b end - (Relation::MULTI_VALUE_METHODS - [:references]).each do |method| + (Relation::MULTI_VALUE_METHODS - [:references, :extending]).each do |method| test "##{method}!" do assert relation.public_send("#{method}!", :foo).equal?(relation) assert_equal [:foo], relation.public_send("#{method}_values") @@ -168,6 +168,14 @@ module ActiveRecord assert relation.references_values.include?('foo') end + test 'extending!' do + mod = Module.new + + assert relation.extending!(mod).equal?(relation) + assert [mod], relation.extending_values + assert relation.is_a?(mod) + end + (Relation::SINGLE_VALUE_METHODS - [:lock, :reordering, :reverse_order, :create_with]).each do |method| test "##{method}!" do assert relation.public_send("#{method}!", :foo).equal?(relation) @@ -195,13 +203,6 @@ module ActiveRecord assert !relation.reverse_order_value end - test 'extending!' do - mod = Module.new - - assert relation.extending!(mod).equal?(relation) - assert relation.is_a?(mod) - end - test 'create_with!' do assert relation.create_with!(foo: 'bar').equal?(relation) assert_equal({foo: 'bar'}, relation.create_with_value) -- cgit v1.2.3