diff options
| author | José Valim <jose.valim@gmail.com> | 2011-05-10 09:41:28 -0700 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2011-05-10 09:41:28 -0700 |
| commit | ceaf73a503814d000167503888a62c1a393730d4 (patch) | |
| tree | 28fed0ac20ba91f31345e911c73e7247d16efe4e /activerecord | |
| parent | 4de977117f5d7123aa97ab3837cc96ec19c68d33 (diff) | |
| parent | 2cef2d411a20b89b71fb76876c33b331f94d0cc5 (diff) | |
| download | rails-ceaf73a503814d000167503888a62c1a393730d4.tar.gz rails-ceaf73a503814d000167503888a62c1a393730d4.tar.bz2 rails-ceaf73a503814d000167503888a62c1a393730d4.zip | |
Merge pull request #492 from jaw6/master
Serialized methods that return nil should not be considered YAML
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/test/cases/xml_serialization_test.rb | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/activerecord/test/cases/xml_serialization_test.rb b/activerecord/test/cases/xml_serialization_test.rb index a6074b23e7..756c8a32eb 100644 --- a/activerecord/test/cases/xml_serialization_test.rb +++ b/activerecord/test/cases/xml_serialization_test.rb @@ -143,10 +143,7 @@ class NilXmlSerializationTest < ActiveRecord::TestCase end def test_should_serialize_yaml - assert %r{<preferences(.*)></preferences>}.match(@xml) - attributes = $1 - assert_match %r{type="yaml"}, attributes - assert_match %r{nil="true"}, attributes + assert_match %r{<preferences nil=\"true\"></preferences>}, @xml end end |