diff options
author | David Heinemeier Hansson <david@loudthinking.com> | 2006-03-20 06:45:34 +0000 |
---|---|---|
committer | David Heinemeier Hansson <david@loudthinking.com> | 2006-03-20 06:45:34 +0000 |
commit | 1aff68d61574410fa942aa34ec261c68565e48c1 (patch) | |
tree | bc23d1bb58cedaf97a8cf4afff59454b25129735 /activerecord/test | |
parent | 89c0ab6b82410b826dacb53803a36b935bae36cb (diff) | |
download | rails-1aff68d61574410fa942aa34ec261c68565e48c1.tar.gz rails-1aff68d61574410fa942aa34ec261c68565e48c1.tar.bz2 rails-1aff68d61574410fa942aa34ec261c68565e48c1.zip |
Fix bug introduced by changeset 3679 which caused custom attribute? methods to be overridden. Also ensure that ? methods are defined even if read method is customised. (closes #3677) [jonathan@bluewire.net.nz]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4002 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/test')
-rwxr-xr-x | activerecord/test/base_test.rb | 5 | ||||
-rwxr-xr-x | activerecord/test/fixtures/company.rb | 9 |
2 files changed, 12 insertions, 2 deletions
diff --git a/activerecord/test/base_test.rb b/activerecord/test/base_test.rb index 35b00b878a..9f79fc9b13 100755 --- a/activerecord/test/base_test.rb +++ b/activerecord/test/base_test.rb @@ -266,7 +266,7 @@ class BasicsTest < Test::Unit::TestCase if ActiveRecord::Base.generate_read_methods assert_readers(Topic, %w(type replies_count)) assert_readers(Firm, %w(type)) - assert_readers(Client, %w(type)) + assert_readers(Client, %w(type ruby_type rating?)) else [Topic, Firm, Client].each {|klass| assert_equal klass.read_methods, {}} end @@ -1282,8 +1282,9 @@ class BasicsTest < Test::Unit::TestCase private def assert_readers(model, exceptions) - expected_readers = Set.new(model.column_names - (model.serialized_attributes.keys + exceptions + ['id'])) + expected_readers = Set.new(model.column_names - (model.serialized_attributes.keys + ['id'])) expected_readers += expected_readers.map { |col| "#{col}?" } + expected_readers -= exceptions assert_equal expected_readers, model.read_methods end end diff --git a/activerecord/test/fixtures/company.rb b/activerecord/test/fixtures/company.rb index b0694ff361..59a7cdd13e 100755 --- a/activerecord/test/fixtures/company.rb +++ b/activerecord/test/fixtures/company.rb @@ -57,6 +57,15 @@ class Client < Company end true end + + # Used to test that read and question methods are not generated for these attributes + def ruby_type + read_attribute :ruby_type + end + + def rating? + query_attribute :rating + end end |