diff options
author | Emilio Tagua <miloops@gmail.com> | 2009-06-30 20:12:17 -0300 |
---|---|---|
committer | Emilio Tagua <miloops@gmail.com> | 2009-06-30 20:12:17 -0300 |
commit | e5b8c4483c8de805d5847563edcf4e5d7e035a87 (patch) | |
tree | 00f579d40ce23c5ebb0a3386ca5c00d22406bbd6 /activerecord/test/cases | |
parent | 9c70442534c7754eac3738e0ddf11446b01c4f9e (diff) | |
parent | db3de78a83379ab2a58e0d29fb10622b813a4d44 (diff) | |
download | rails-e5b8c4483c8de805d5847563edcf4e5d7e035a87.tar.gz rails-e5b8c4483c8de805d5847563edcf4e5d7e035a87.tar.bz2 rails-e5b8c4483c8de805d5847563edcf4e5d7e035a87.zip |
Merge commit 'rails/master'
Conflicts:
activerecord/lib/active_record/base.rb
Diffstat (limited to 'activerecord/test/cases')
-rw-r--r-- | activerecord/test/cases/reflection_test.rb | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/activerecord/test/cases/reflection_test.rb b/activerecord/test/cases/reflection_test.rb index db64bbb806..d861b5bb24 100644 --- a/activerecord/test/cases/reflection_test.rb +++ b/activerecord/test/cases/reflection_test.rb @@ -5,14 +5,20 @@ require 'models/company' require 'models/company_in_module' require 'models/subscriber' require 'models/pirate' +require 'models/price_estimate' class ReflectionTest < ActiveRecord::TestCase - fixtures :topics, :customers, :companies, :subscribers + fixtures :topics, :customers, :companies, :subscribers, :price_estimates def setup @first = Topic.find(1) end + def test_human_name + assert_equal "Price estimate", PriceEstimate.human_name + assert_equal "Subscriber", Subscriber.human_name + end + def test_column_null_not_null subscriber = Subscriber.find(:first) assert subscriber.column_for_attribute("name").null |