Avoid changing the global state on the tests

rails · Jan 5, 2015 · 1c81926 · 1c81926
1 parent d76bf34
commit 1c81926
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/actionview/test/template/translation_helper_test.rb b/actionview/test/template/translation_helper_test.rb
@@ -14,7 +14,6 @@ class TranslationHelperTest < ActiveSupport::TestCase
   attr_reader :request, :view
 
   setup do
-    I18n.exception_handler = nil
     I18n.backend.store_translations(:en,
       :translations => {
         :templates => {
@@ -82,13 +81,19 @@ def test_raises_missing_translation_message_with_raise_option
   end
 
   def test_uses_custom_exception_handler_when_specified
+    old_exception_handler = I18n.exception_handler
     I18n.exception_handler = I18n::CustomExceptionHandler
     assert_equal 'from CustomExceptionHandler', translate(:"translations.missing", raise: false)
+  ensure
+    I18n.exception_handler = old_exception_handler
   end
 
   def test_uses_custom_exception_handler_when_specified_for_html
+    old_exception_handler = I18n.exception_handler
     I18n.exception_handler = I18n::CustomExceptionHandler
     assert_equal 'from CustomExceptionHandler', translate(:"translations.missing_html", raise: false)
+  ensure
+    I18n.exception_handler = old_exception_handler
   end
 
   def test_i18n_translate_defaults_to_nil_rescue_format