diff options
author | Aaron Patterson <aaron.patterson@gmail.com> | 2011-01-11 15:39:26 -0800 |
---|---|---|
committer | Aaron Patterson <aaron.patterson@gmail.com> | 2011-01-11 15:39:26 -0800 |
commit | fcd8925f236b391d562dc504bcd901f501140c11 (patch) | |
tree | 0e0f26167a4048b7302c5c57fef9bba69f93e8ed /activerecord | |
parent | 5696d948ed0eb9cf755e843564f80801ea864ee2 (diff) | |
download | rails-fcd8925f236b391d562dc504bcd901f501140c11.tar.gz rails-fcd8925f236b391d562dc504bcd901f501140c11.tar.bz2 rails-fcd8925f236b391d562dc504bcd901f501140c11.zip |
use underlying _read_attribute method rather than causing NoMethodErrors
Diffstat (limited to 'activerecord')
-rw-r--r-- | activerecord/lib/active_record/base.rb | 2 | ||||
-rw-r--r-- | activerecord/test/cases/associations/join_model_test.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb index a5b71ba280..dde52269d4 100644 --- a/activerecord/lib/active_record/base.rb +++ b/activerecord/lib/active_record/base.rb @@ -1578,7 +1578,7 @@ MSG # Returns true if the specified +attribute+ has been set by the user or by a database load and is neither # nil nor empty? (the latter only applies to objects that respond to empty?, most notably Strings). def attribute_present?(attribute) - !read_attribute(attribute).blank? + !_read_attribute(attribute).blank? end # Returns the column object for the named attribute. diff --git a/activerecord/test/cases/associations/join_model_test.rb b/activerecord/test/cases/associations/join_model_test.rb index 512a6d3ef8..c50fcd3f33 100644 --- a/activerecord/test/cases/associations/join_model_test.rb +++ b/activerecord/test/cases/associations/join_model_test.rb @@ -523,7 +523,7 @@ class AssociationsJoinModelTest < ActiveRecord::TestCase def test_has_many_through_collection_size_uses_counter_cache_if_it_exists author = authors(:david) - author.stubs(:read_attribute).with('comments_count').returns(100) + author.stubs(:_read_attribute).with('comments_count').returns(100) assert_equal 100, author.comments.size assert !author.comments.loaded? end |