aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/test
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2014-05-13 16:11:40 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2014-05-13 16:11:40 -0300
commit2b84eea9c0ccf910111c447a04ed968f2e8a74d2 (patch)
tree46c24d584eca1013e6c900a3c02c1b8bd70f33b5 /activesupport/test
parent0626543f6d4c45250da15f41d715754c3be5a67e (diff)
parent3703a8ae9b74ef76551a1e95d4d31aa9fce72eb3 (diff)
downloadrails-2b84eea9c0ccf910111c447a04ed968f2e8a74d2.tar.gz
rails-2b84eea9c0ccf910111c447a04ed968f2e8a74d2.tar.bz2
rails-2b84eea9c0ccf910111c447a04ed968f2e8a74d2.zip
Merge pull request #15072 from mjtko/fix/issue-15064
[Fixes #15064] Calling number_to_delimited on a ActiveSupport::SafeBuffer results in mangled output
Diffstat (limited to 'activesupport/test')
-rw-r--r--activesupport/test/number_helper_test.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/activesupport/test/number_helper_test.rb b/activesupport/test/number_helper_test.rb
index 9bdb92024e..a7a0ae02e7 100644
--- a/activesupport/test/number_helper_test.rb
+++ b/activesupport/test/number_helper_test.rb
@@ -1,5 +1,6 @@
require 'abstract_unit'
require 'active_support/number_helper'
+require 'active_support/core_ext/string/output_safety'
module ActiveSupport
module NumberHelper
@@ -97,6 +98,7 @@ module ActiveSupport
assert_equal("123,456,789.78901", number_helper.number_to_delimited(123456789.78901))
assert_equal("0.78901", number_helper.number_to_delimited(0.78901))
assert_equal("123,456.78", number_helper.number_to_delimited("123456.78"))
+ assert_equal("123,456.78", number_helper.number_to_delimited("123456.78".html_safe))
end
end