aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/controller/localized_templates_test.rb
diff options
context:
space:
mode:
authorAkira Matsuda <ronnie@dio.jp>2013-01-22 10:27:12 +0900
committerAkira Matsuda <ronnie@dio.jp>2013-01-22 10:27:12 +0900
commit1e8d5e62c6c19dde238a6e17b135993b9c0e0cd6 (patch)
treeeb43f868fe0b02be09f52a9707e576c0bf84e9d0 /actionpack/test/controller/localized_templates_test.rb
parent5e4fb4da83c9ac2d986ed3813ea18c9eb6ddfc99 (diff)
parent484a0fd7fce189655b006ec6ba0d193a97c030cb (diff)
downloadrails-1e8d5e62c6c19dde238a6e17b135993b9c0e0cd6.tar.gz
rails-1e8d5e62c6c19dde238a6e17b135993b9c0e0cd6.tar.bz2
rails-1e8d5e62c6c19dde238a6e17b135993b9c0e0cd6.zip
Merge branch 'isolating_tests'
Now we're almost ready to remove this: https://github.com/rails/rails/blob/5294ad8/activesupport/lib/active_support/test_case.rb#L29
Diffstat (limited to 'actionpack/test/controller/localized_templates_test.rb')
-rw-r--r--actionpack/test/controller/localized_templates_test.rb8
1 files changed, 7 insertions, 1 deletions
diff --git a/actionpack/test/controller/localized_templates_test.rb b/actionpack/test/controller/localized_templates_test.rb
index 41ff2f3809..bac1d02977 100644
--- a/actionpack/test/controller/localized_templates_test.rb
+++ b/actionpack/test/controller/localized_templates_test.rb
@@ -9,14 +9,20 @@ class LocalizedTemplatesTest < ActionController::TestCase
tests LocalizedController
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
-end \ No newline at end of file
+end