aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test
diff options
context:
space:
mode:
authorRafael França <rafaelmfranca@gmail.com>2017-06-14 16:55:34 -0400
committerGitHub <noreply@github.com>2017-06-14 16:55:34 -0400
commitf340490b98ac9f13f004b5db8863cb3ff6fb71f9 (patch)
tree9a957cc5351cca5053351e5a2664ca7d3ad19abc /actionpack/test
parentb81288541b6c8fe04082e4579e549bd71bc350dd (diff)
parentff3c06f718a80c5d943e93e3cb1c784911d5c423 (diff)
downloadrails-f340490b98ac9f13f004b5db8863cb3ff6fb71f9.tar.gz
rails-f340490b98ac9f13f004b5db8863cb3ff6fb71f9.tar.bz2
rails-f340490b98ac9f13f004b5db8863cb3ff6fb71f9.zip
Merge pull request #29451 from vipulnsward/29441-flatten-default
Allow translate default option to accept an array similar to i18n.t
Diffstat (limited to 'actionpack/test')
-rw-r--r--actionpack/test/abstract/translation_test.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/actionpack/test/abstract/translation_test.rb b/actionpack/test/abstract/translation_test.rb
index 0c4071df8d..4893144905 100644
--- a/actionpack/test/abstract/translation_test.rb
+++ b/actionpack/test/abstract/translation_test.rb
@@ -62,6 +62,7 @@ module AbstractController
def test_default_translation
@controller.stub :action_name, :index do
assert_equal "bar", @controller.t("one.two")
+ assert_equal "baz", @controller.t(".twoz", default: ["baz", :twoz])
end
end