From feec54b781fc59b9771c6b5aeaf424914a165bff Mon Sep 17 00:00:00 2001
From: Carlos Antonio da Silva <carlosantoniodasilva@gmail.com>
Date: Sat, 23 Jun 2012 18:55:46 -0300
Subject: Refactor AV number helper tests with invalid numbers

Just make use of the returning exception from assert_raise, instead of
calling the method again with a rescue clause to test the saved
exception number.
---
 actionpack/test/template/number_helper_test.rb | 58 +++++++-------------------
 1 file changed, 14 insertions(+), 44 deletions(-)

(limited to 'actionpack/test/template/number_helper_test.rb')

diff --git a/actionpack/test/template/number_helper_test.rb b/actionpack/test/template/number_helper_test.rb
index 057cb47f53..d8fffe75ed 100644
--- a/actionpack/test/template/number_helper_test.rb
+++ b/actionpack/test/template/number_helper_test.rb
@@ -361,69 +361,39 @@ class NumberHelperTest < ActionView::TestCase
   end
 
   def test_number_helpers_should_raise_error_if_invalid_when_specified
-    assert_raise InvalidNumberError do
+    exception = assert_raise InvalidNumberError do
       number_to_human("x", :raise => true)
     end
-    begin
-      number_to_human("x", :raise => true)
-    rescue InvalidNumberError => e
-      assert_equal "x", e.number
-    end
+    assert_equal "x", exception.number
 
-    assert_raise InvalidNumberError do
-      number_to_human_size("x", :raise => true)
-    end
-    begin
+    exception = assert_raise InvalidNumberError do
       number_to_human_size("x", :raise => true)
-    rescue InvalidNumberError => e
-      assert_equal "x", e.number
     end
+    assert_equal "x", exception.number
 
-    assert_raise InvalidNumberError do
+    exception = assert_raise InvalidNumberError do
       number_with_precision("x", :raise => true)
     end
-    begin
-      number_with_precision("x", :raise => true)
-    rescue InvalidNumberError => e
-      assert_equal "x", e.number
-    end
+    assert_equal "x", exception.number
 
-    assert_raise InvalidNumberError do
+    exception = assert_raise InvalidNumberError do
       number_to_currency("x", :raise => true)
     end
-    begin
-      number_with_precision("x", :raise => true)
-    rescue InvalidNumberError => e
-      assert_equal "x", e.number
-    end
+    assert_equal "x", exception.number
 
-    assert_raise InvalidNumberError do
+    exception = assert_raise InvalidNumberError do
       number_to_percentage("x", :raise => true)
     end
-    begin
-      number_to_percentage("x", :raise => true)
-    rescue InvalidNumberError => e
-      assert_equal "x", e.number
-    end
+    assert_equal "x", exception.number
 
-    assert_raise InvalidNumberError do
-      number_with_delimiter("x", :raise => true)
-    end
-    begin
+    exception = assert_raise InvalidNumberError do
       number_with_delimiter("x", :raise => true)
-    rescue InvalidNumberError => e
-      assert_equal "x", e.number
     end
+    assert_equal "x", exception.number
 
-    assert_raise InvalidNumberError do
+    exception = assert_raise InvalidNumberError do
       number_to_phone("x", :raise => true)
     end
-    begin
-      number_to_phone("x", :raise => true)
-    rescue InvalidNumberError => e
-      assert_equal "x", e.number
-    end
-
+    assert_equal "x", exception.number
   end
-
 end
-- 
cgit v1.2.3