summaryrefslogtreecommitdiffstats
path: root/rubygem-activesupport-xml-ordering.patch
diff options
context:
space:
mode:
authorKen Dreyer <ktdreyer@ktdreyer.com>2013-02-07 18:28:27 -0700
committerKen Dreyer <ktdreyer@ktdreyer.com>2013-02-07 19:54:26 -0700
commit9613ddcd9c80b8cbad76e1814d1f3f809a03ebb9 (patch)
tree01d3c793a28c6c4176b18006c5f5f711c59c9633 /rubygem-activesupport-xml-ordering.patch
parentd7750c1c48a8cffb2c088bc0225594fd101bafbf (diff)
downloadrubygem-activesupport-9613ddcd9c80b8cbad76e1814d1f3f809a03ebb9.tar.gz
rubygem-activesupport-9613ddcd9c80b8cbad76e1814d1f3f809a03ebb9.tar.xz
rubygem-activesupport-9613ddcd9c80b8cbad76e1814d1f3f809a03ebb9.zip
Downgrade to ActiveSupport 2.3.16 and add RHEL 6 compatibility
- Downgrade to ActiveSupport 2.3.16. - RHEL 6 compatibility.
Diffstat (limited to 'rubygem-activesupport-xml-ordering.patch')
-rw-r--r--rubygem-activesupport-xml-ordering.patch36
1 files changed, 36 insertions, 0 deletions
diff --git a/rubygem-activesupport-xml-ordering.patch b/rubygem-activesupport-xml-ordering.patch
new file mode 100644
index 0000000..8b0f247
--- /dev/null
+++ b/rubygem-activesupport-xml-ordering.patch
@@ -0,0 +1,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 &amp; Last Name'
+ }.stringify_keys
+-
+- expected_xml = '<person><bare-string>First &amp; Last Name</bare-string><pre-escaped-string>First &amp;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 &amp; Last Name</bare-string>")
++ assert hash.to_xml(@xml_options).include?("<pre-escaped-string>First &amp;amp; Last Name</pre-escaped-string>")
+ end
+
+ def test_unescaping_from_xml
+--
+1.7.1
+