diff options
| author | Yves Senn <yves.senn@gmail.com> | 2014-06-06 19:23:18 +0200 |
|---|---|---|
| committer | Yves Senn <yves.senn@gmail.com> | 2014-06-06 19:23:18 +0200 |
| commit | 6680ee9427ae2639e404cd3b9538f54e136057c6 (patch) | |
| tree | 15a7a0164bd967195114f59ff638f9005d426c2c /actionmailer | |
| parent | 0502189b504640a95a4729fac5c6a41c27de960f (diff) | |
| parent | 573a8421e7e5937c7afbd4b9140136e444db645a (diff) | |
| download | rails-6680ee9427ae2639e404cd3b9538f54e136057c6.tar.gz rails-6680ee9427ae2639e404cd3b9538f54e136057c6.tar.bz2 rails-6680ee9427ae2639e404cd3b9538f54e136057c6.zip | |
Merge pull request #15548 from zuhao/refactor_actionmailer_i18n_with_controller_test
Restore I18n.locale to default after test.
Diffstat (limited to 'actionmailer')
| -rw-r--r-- | actionmailer/test/i18n_with_controller_test.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/actionmailer/test/i18n_with_controller_test.rb b/actionmailer/test/i18n_with_controller_test.rb index d502d42ffd..d9d588a950 100644 --- a/actionmailer/test/i18n_with_controller_test.rb +++ b/actionmailer/test/i18n_with_controller_test.rb @@ -32,6 +32,10 @@ class ActionMailerI18nWithControllerTest < ActionDispatch::IntegrationTest Routes end + teardown do + I18n.locale = I18n.default_locale + end + def test_send_mail with_translation 'de', email_subject: '[Anmeldung] Willkommen' do get '/test/send_mail' |