diff options
| author | Guillermo Iguaran <guilleiguaran@gmail.com> | 2013-12-03 02:34:11 -0500 |
|---|---|---|
| committer | Guillermo Iguaran <guilleiguaran@gmail.com> | 2013-12-03 02:34:11 -0500 |
| commit | 9ed3aab6927471078888ff51c255561350946344 (patch) | |
| tree | 337d71804afb740c0def41359239186fcb28317b /actionpack/test/controller | |
| parent | c48a0cac626b4e32d7abfa9f4f1fae16568157d9 (diff) | |
| parent | 43962d6ec50f918c9970bd3cd4b6ee5c7f7426ed (diff) | |
| download | rails-9ed3aab6927471078888ff51c255561350946344.tar.gz rails-9ed3aab6927471078888ff51c255561350946344.tar.bz2 rails-9ed3aab6927471078888ff51c255561350946344.zip | |
Merge branch 'format_localized_template' of https://github.com/acapilleri/rails
Conflicts:
actionpack/CHANGELOG.md
Diffstat (limited to 'actionpack/test/controller')
| -rw-r--r-- | actionpack/test/controller/localized_templates_test.rb | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/actionpack/test/controller/localized_templates_test.rb b/actionpack/test/controller/localized_templates_test.rb index 6b02eedaed..c95ef8a0c7 100644 --- a/actionpack/test/controller/localized_templates_test.rb +++ b/actionpack/test/controller/localized_templates_test.rb @@ -34,4 +34,15 @@ class LocalizedTemplatesTest < ActionController::TestCase get :hello_world assert_equal "Gutten Tag", @response.body 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 |