From 51d548a22184a8352b9d48a37e510deb23f06a82 Mon Sep 17 00:00:00 2001
From: Yves Senn <yves.senn@gmail.com>
Date: Fri, 6 Mar 2015 09:04:51 +0100
Subject: [PATCH] `number_to_percentage` and `precision: 0` work with `NAN` and
 `INFINITY`.

Closes #19227.

Conflicts:
	activesupport/lib/active_support/number_helper/number_to_rounded_converter.rb
	activesupport/test/number_helper_test.rb
---
 actionview/test/template/number_helper_test.rb             | 4 ++++
 activesupport/CHANGELOG.md                                 | 7 +++++++
 .../number_helper/number_to_rounded_converter.rb           | 2 +-
 activesupport/test/number_helper_test.rb                   | 4 ++++
 4 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/actionview/test/template/number_helper_test.rb b/actionview/test/template/number_helper_test.rb
index b59883b760cbc..b70b7508695a2 100644
--- a/actionview/test/template/number_helper_test.rb
+++ b/actionview/test/template/number_helper_test.rb
@@ -35,6 +35,10 @@ def test_number_to_percentage
     assert_equal "98a%", number_to_percentage("98a")
     assert_equal "NaN%", number_to_percentage(Float::NAN)
     assert_equal "Inf%", number_to_percentage(Float::INFINITY)
+    assert_equal "NaN%", number_to_percentage(Float::NAN, precision: 0)
+    assert_equal "Inf%", number_to_percentage(Float::INFINITY, precision: 0)
+    assert_equal "NaN%", number_to_percentage(Float::NAN, precision: 1)
+    assert_equal "Inf%", number_to_percentage(Float::INFINITY, precision: 1)
   end
 
   def test_number_with_delimiter
diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md
index 3cb69676a7744..be979c033cd99 100644
--- a/activesupport/CHANGELOG.md
+++ b/activesupport/CHANGELOG.md
@@ -1,3 +1,10 @@
+*   `number_to_percentage` does not crash with `Float::NAN` or `Float::INFINITY`
+    as input when `precision: 0` is used.
+
+    Fixes #19227.
+
+    *Yves Senn*
+
 *   Take DST into account when locating TimeZone from Numeric.
 
     When given a specific offset, use the first result found where the
diff --git a/activesupport/lib/active_support/number_helper/number_to_rounded_converter.rb b/activesupport/lib/active_support/number_helper/number_to_rounded_converter.rb
index dcf9a567e8d76..65e9b3510ecfc 100644
--- a/activesupport/lib/active_support/number_helper/number_to_rounded_converter.rb
+++ b/activesupport/lib/active_support/number_helper/number_to_rounded_converter.rb
@@ -23,7 +23,7 @@ def convert
           precision = 0 if precision < 0 # don't let it be negative
         else
           rounded_number = number.round(precision)
-          rounded_number = rounded_number.to_i if precision == 0
+          rounded_number = rounded_number.to_i if precision == 0 && rounded_number.finite?
           rounded_number = rounded_number.abs if rounded_number.zero? # prevent showing negative zeros
         end
 
diff --git a/activesupport/test/number_helper_test.rb b/activesupport/test/number_helper_test.rb
index 50d84a9470ca5..20657f57b56e4 100644
--- a/activesupport/test/number_helper_test.rb
+++ b/activesupport/test/number_helper_test.rb
@@ -83,6 +83,10 @@ def test_number_to_percentage
           assert_equal("98a%", number_helper.number_to_percentage("98a"))
           assert_equal("NaN%", number_helper.number_to_percentage(Float::NAN))
           assert_equal("Inf%", number_helper.number_to_percentage(Float::INFINITY))
+          assert_equal("NaN%", number_helper.number_to_percentage(Float::NAN, precision: 0))
+          assert_equal("Inf%", number_helper.number_to_percentage(Float::INFINITY, precision: 0))
+          assert_equal("NaN%", number_helper.number_to_percentage(Float::NAN, precision: 1))
+          assert_equal("Inf%", number_helper.number_to_percentage(Float::INFINITY, precision: 1))
         end
       end