diff options
Diffstat (limited to 'activerecord/test')
-rw-r--r-- | activerecord/test/fixtures/author.rb | 4 | ||||
-rw-r--r-- | activerecord/test/xml_serialization_test.rb | 16 |
2 files changed, 18 insertions, 2 deletions
diff --git a/activerecord/test/fixtures/author.rb b/activerecord/test/fixtures/author.rb index 6b34c7522c..61ba3c1551 100644 --- a/activerecord/test/fixtures/author.rb +++ b/activerecord/test/fixtures/author.rb @@ -67,6 +67,10 @@ class Author < ActiveRecord::Base @post_log = [] end + def label + "#{id}-#{name}" + end + private def log_before_adding(object) @post_log << "before_adding#{object.id}" diff --git a/activerecord/test/xml_serialization_test.rb b/activerecord/test/xml_serialization_test.rb index 5cb40752ec..8c59d5d26b 100644 --- a/activerecord/test/xml_serialization_test.rb +++ b/activerecord/test/xml_serialization_test.rb @@ -1,6 +1,7 @@ require 'abstract_unit' require 'fixtures/post' require 'fixtures/author' +require 'fixtures/tagging' class Contact < ActiveRecord::Base # mock out self.columns so no pesky db is needed for these tests @@ -142,12 +143,23 @@ class DatabaseConnectedXmlSerializationTest < Test::Unit::TestCase second_xml_size = david.to_xml(options).size assert_equal first_xml_size, second_xml_size end - def test_include_uses_association_name - xml = authors(:david).to_xml :include=>:hello_posts, :indent=>0 + xml = authors(:david).to_xml :include=>:hello_posts, :indent => 0 assert_match %r{<hello-posts type="array">}, xml assert_match %r{<post>}, xml assert_match %r{<sti-post>}, xml end + + def test_methods_are_called_on_object + xml = authors(:david).to_xml :methods => :label, :indent => 0 + assert_match %r{<label>.*</label>}, xml + end + + def test_should_not_call_methods_on_associations_that_dont_respond + xml = authors(:david).to_xml :include=>:hello_posts, :methods => :label, :indent => 2 + assert !authors(:david).hello_posts.first.respond_to?(:label) + assert_match %r{^ <label>.*</label>}, xml + assert_no_match %r{^ <label>}, xml + end end
\ No newline at end of file |