diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-08-01 15:09:56 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-08-01 15:09:56 -0300 |
| commit | 736bf14d7c15776f17f6e096dba5024a36d15580 (patch) | |
| tree | 0db6556859595f586c2c171599713112b0268d1d /activerecord/test/cases | |
| parent | 0c527026308627652c42ed8a6f26a21d3bbc7a5b (diff) | |
| download | rails-736bf14d7c15776f17f6e096dba5024a36d15580.tar.gz rails-736bf14d7c15776f17f6e096dba5024a36d15580.tar.bz2 rails-736bf14d7c15776f17f6e096dba5024a36d15580.zip | |
Revert "Deprecating composed_of in ActiveRecord"
This reverts commit 44b313bc4e3762da64dde7894548f81c595147de.
Diffstat (limited to 'activerecord/test/cases')
| -rw-r--r-- | activerecord/test/cases/aggregations_test.rb | 8 |
1 files changed, 2 insertions, 6 deletions
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 |