From 736bf14d7c15776f17f6e096dba5024a36d15580 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?= Date: Wed, 1 Aug 2012 15:09:56 -0300 Subject: Revert "Deprecating composed_of in ActiveRecord" This reverts commit 44b313bc4e3762da64dde7894548f81c595147de. --- activerecord/test/cases/aggregations_test.rb | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'activerecord/test/cases') diff --git a/activerecord/test/cases/aggregations_test.rb b/activerecord/test/cases/aggregations_test.rb index 7eb7ffdd2d..3e0e6dce2c 100644 --- a/activerecord/test/cases/aggregations_test.rb +++ b/activerecord/test/cases/aggregations_test.rb @@ -126,15 +126,11 @@ class OverridingAggregationsTest < ActiveRecord::TestCase class DifferentName; end class Person < ActiveRecord::Base - ActiveSupport::Deprecation.silence do - composed_of :composed_of, :mapping => %w(person_first_name first_name) - end + composed_of :composed_of, :mapping => %w(person_first_name first_name) end class DifferentPerson < Person - ActiveSupport::Deprecation.silence do - composed_of :composed_of, :class_name => 'DifferentName', :mapping => %w(different_person_first_name first_name) - end + composed_of :composed_of, :class_name => 'DifferentName', :mapping => %w(different_person_first_name first_name) end def test_composed_of_aggregation_redefinition_reflections_should_differ_and_not_inherited -- cgit v1.2.3