aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/cases/xml_serialization_test.rb
diff options
context:
space:
mode:
authorCarl Lerche <carllerche@mac.com>2010-04-18 13:02:37 -0700
committerCarl Lerche <carllerche@mac.com>2010-04-18 13:02:37 -0700
commitd32a4cbaa5174cc1a73d41a73f55145251c18c84 (patch)
tree16e3ad82102aa6d290b8941dd69e27b1efaf14f6 /activerecord/test/cases/xml_serialization_test.rb
parentc16c248912e4ae3b6a64e6acdbf1a1e0dd2feb26 (diff)
parent8c7e8976e97d96f514e22b04fc1afb9453134076 (diff)
downloadrails-d32a4cbaa5174cc1a73d41a73f55145251c18c84.tar.gz
rails-d32a4cbaa5174cc1a73d41a73f55145251c18c84.tar.bz2
rails-d32a4cbaa5174cc1a73d41a73f55145251c18c84.zip
Merge branch 'master' of github.com:rails/rails
Diffstat (limited to 'activerecord/test/cases/xml_serialization_test.rb')
-rw-r--r--activerecord/test/cases/xml_serialization_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/test/cases/xml_serialization_test.rb b/activerecord/test/cases/xml_serialization_test.rb
index 2849ff11b7..f5a18827d8 100644
--- a/activerecord/test/cases/xml_serialization_test.rb
+++ b/activerecord/test/cases/xml_serialization_test.rb
@@ -79,7 +79,7 @@ class DefaultXmlSerializationTest < ActiveRecord::TestCase
end
def test_should_serialize_yaml
- assert_match %r{<preferences type=\"yaml\">--- \n:gem: ruby\n</preferences>}, @xml
+ assert_match %r{<preferences type=\"yaml\">---\s?\n:gem: ruby\n</preferences>}, @xml
end
end