aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/cases/finder_test.rb
diff options
context:
space:
mode:
authorJon Leighton <j@jonathanleighton.com>2011-04-15 13:27:08 +0100
committerJon Leighton <j@jonathanleighton.com>2011-04-15 13:27:08 +0100
commit65469a6e5e8cd2418c99c3862dd33feed69536bd (patch)
tree68a2ba51dba0b182179652851706096b9cb33f58 /activerecord/test/cases/finder_test.rb
parente01dfb27fc5573db9070dce788f2e5ee62094722 (diff)
downloadrails-65469a6e5e8cd2418c99c3862dd33feed69536bd.tar.gz
rails-65469a6e5e8cd2418c99c3862dd33feed69536bd.tar.bz2
rails-65469a6e5e8cd2418c99c3862dd33feed69536bd.zip
Return nil from read_attribute(:foo) if 'foo' is not present in the @attributes hash, but the _foo method has been defined. This brings the behaviour into line with the 3-0-stable branch and the master branch before 93641ed6c8c684f6b4db02b6c8a22fa9bc7f0eaf (there were previously no assertions about this which is why the change slipped through). Note that actually calling the 'foo' method will still raise an error if the attribute is not present.
Diffstat (limited to 'activerecord/test/cases/finder_test.rb')
-rw-r--r--activerecord/test/cases/finder_test.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/activerecord/test/cases/finder_test.rb b/activerecord/test/cases/finder_test.rb
index 3c242667eb..655437318f 100644
--- a/activerecord/test/cases/finder_test.rb
+++ b/activerecord/test/cases/finder_test.rb
@@ -247,9 +247,10 @@ class FinderTest < ActiveRecord::TestCase
def test_find_only_some_columns
topic = Topic.find(1, :select => "author_name")
assert_raise(ActiveModel::MissingAttributeError) {topic.title}
+ assert_nil topic.read_attribute("title")
assert_equal "David", topic.author_name
assert !topic.attribute_present?("title")
- #assert !topic.respond_to?("title")
+ assert !topic.attribute_present?(:title)
assert topic.attribute_present?("author_name")
assert_respond_to topic, "author_name"
end