Browse files

Merge pull request #15715 from zuhao/refactor_actionview_cleanup_I18n…

…_translations

Clean up I18n stored translations after test.
  • Loading branch information...
2 parents 5223bad + 48d1185 commit 64220a1de3574ceab70d3ed06e83ee8711ac2204 @senny senny committed Jun 14, 2014
View
6 actionview/test/template/form_helper_test.rb
@@ -10,9 +10,11 @@ def form_for(*)
@output_buffer = super
end
- def setup
- super
+ teardown do
+ I18n.backend.reload!
+ end
+ setup do
# Create "label" locale for testing I18n label helpers
I18n.backend.store_translations 'label', {
activemodel: {
View
3 actionview/test/template/render_test.rb
@@ -12,7 +12,6 @@ def setup_view(paths)
@controller_view = TestController.new.view_context
# Reload and register danish language for testing
- I18n.reload!
I18n.backend.store_translations 'da', {}
I18n.backend.store_translations 'pt-BR', {}
@@ -513,6 +512,7 @@ def setup
def teardown
GC.start
+ I18n.reload!
end
end
@@ -530,6 +530,7 @@ def setup
def teardown
GC.start
+ I18n.reload!
end
def test_render_utf8_template_with_magic_comment
View
6 actionview/test/template/translation_helper_test.rb
@@ -6,7 +6,7 @@ class TranslationHelperTest < ActiveSupport::TestCase
attr_reader :request, :view
- def setup
+ setup do
I18n.backend.store_translations(:en,
:translations => {
:templates => {
@@ -30,6 +30,10 @@ def setup
@view = ::ActionView::Base.new(ActionController::Base.view_paths, {})
end
+ teardown do
+ I18n.backend.reload!
+ end
+
def test_delegates_to_i18n_setting_the_rescue_format_option_to_html
I18n.expects(:translate).with(:foo, :locale => 'en', :raise=>true).returns("")
translate :foo, :locale => 'en'

0 comments on commit 64220a1

Please sign in to comment.