blob: 8b0f2479e42be5af3eb316396974c4058e8aee16 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
|
From 32517cdb387a2e4922e31cddb38912148ddb4710 Mon Sep 17 00:00:00 2001
From: Ken Dreyer <ktdreyer@ktdreyer.com>
Date: Thu, 7 Feb 2013 19:32:44 -0700
Subject: [PATCH] Fixed failing test for ruby-1.8.7-p357
See #4292
(cherry picked from commit 91a9b2441783de118a2f9ec11b0aa3ae80133d91)
Conflicts:
activesupport/test/core_ext/hash_ext_test.rb
---
activesupport/test/core_ext/hash_ext_test.rb | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/activesupport/test/core_ext/hash_ext_test.rb b/activesupport/test/core_ext/hash_ext_test.rb
index 80873b4..308c6b0 100644
--- a/activesupport/test/core_ext/hash_ext_test.rb
+++ b/activesupport/test/core_ext/hash_ext_test.rb
@@ -892,9 +892,9 @@ class HashToXmlTest < Test::Unit::TestCase
:bare_string => 'First & Last Name',
:pre_escaped_string => 'First & Last Name'
}.stringify_keys
-
- expected_xml = '<person><bare-string>First & Last Name</bare-string><pre-escaped-string>First &amp; Last Name</pre-escaped-string></person>'
- assert_equal expected_xml, hash.to_xml(@xml_options)
+
+ assert hash.to_xml(@xml_options).include?("<bare-string>First & Last Name</bare-string>")
+ assert hash.to_xml(@xml_options).include?("<pre-escaped-string>First &amp; Last Name</pre-escaped-string>")
end
def test_unescaping_from_xml
--
1.7.1
|
