From 1407315423782f9512f73f5111cb27d9bc11cff6 Mon Sep 17 00:00:00 2001
From: Zuhao Wan <wanzuhao@gmail.com>
Date: Wed, 28 May 2014 21:50:30 +0800
Subject: Move I18n.locale setting into setup and teardown.

---
 actionpack/test/controller/localized_templates_test.rb | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/actionpack/test/controller/localized_templates_test.rb b/actionpack/test/controller/localized_templates_test.rb
index c95ef8a0c7..27871ef351 100644
--- a/actionpack/test/controller/localized_templates_test.rb
+++ b/actionpack/test/controller/localized_templates_test.rb
@@ -8,22 +8,24 @@ end
 class LocalizedTemplatesTest < ActionController::TestCase
   tests LocalizedController
 
+  setup do
+    @old_locale = I18n.locale
+  end
+
+  teardown do
+    I18n.locale = @old_locale
+  end
+
   def test_localized_template_is_used
-    old_locale = I18n.locale
     I18n.locale = :de
     get :hello_world
     assert_equal "Gutten Tag", @response.body
-  ensure
-    I18n.locale = old_locale
   end
 
   def test_default_locale_template_is_used_when_locale_is_missing
-    old_locale = I18n.locale
     I18n.locale = :dk
     get :hello_world
     assert_equal "Hello World", @response.body
-  ensure
-    I18n.locale = old_locale
   end
 
   def test_use_fallback_locales
@@ -36,13 +38,9 @@ class LocalizedTemplatesTest < ActionController::TestCase
   end
 
   def test_localized_template_has_correct_header_with_no_format_in_template_name
-    old_locale = I18n.locale
     I18n.locale = :it
-
     get :hello_world
     assert_equal "Ciao Mondo", @response.body
     assert_equal "text/html",  @response.content_type
-  ensure
-    I18n.locale = old_locale
   end
 end
-- 
cgit v1.2.3