Permalink
Browse files

Move I18n.locale setting into setup and teardown.

  • Loading branch information...
zuhao committed May 28, 2014
1 parent bdbf00d commit 1407315423782f9512f73f5111cb27d9bc11cff6
Showing with 8 additions and 10 deletions.
  1. +8 −10 actionpack/test/controller/localized_templates_test.rb
@@ -8,22 +8,24 @@ def hello_world
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 @@ def test_use_fallback_locales
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

0 comments on commit 1407315

Please sign in to comment.