From 40a8130bc5f00f0d77b152e75484f175d70cabdd Mon Sep 17 00:00:00 2001
From: printercu <printercu@gmail.com>
Date: Wed, 7 Aug 2013 12:33:28 +0400
Subject: ActionController#translate supports symbols

Made it similar to views helper.
---
 actionpack/test/abstract/translation_test.rb | 27 +++++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

(limited to 'actionpack/test')

diff --git a/actionpack/test/abstract/translation_test.rb b/actionpack/test/abstract/translation_test.rb
index 4fdc480b43..d43a445535 100644
--- a/actionpack/test/abstract/translation_test.rb
+++ b/actionpack/test/abstract/translation_test.rb
@@ -9,6 +9,20 @@ module AbstractController
     class TranslationControllerTest < ActiveSupport::TestCase
       def setup
         @controller = TranslationController.new
+        I18n.backend.store_translations(:en, {
+          one: {
+            two: 'bar',
+          },
+          abstract_controller: {
+            testing: {
+              translation: {
+                index: {
+                  foo: 'bar',
+                },
+              },
+            },
+          },
+        })
       end
 
       def test_action_controller_base_responds_to_translate
@@ -28,16 +42,17 @@ module AbstractController
       end
 
       def test_lazy_lookup
-        expected = 'bar'
         @controller.stubs(action_name: :index)
-        I18n.stubs(:translate).with('abstract_controller.testing.translation.index.foo').returns(expected)
-        assert_equal expected, @controller.t('.foo')
+        assert_equal 'bar', @controller.t('.foo')
+      end
+
+      def test_lazy_lookup_with_symbol
+        @controller.stubs(action_name: :index)
+        assert_equal 'bar', @controller.t(:'.foo')
       end
 
       def test_default_translation
-        key, expected = 'one.two', 'bar'
-        I18n.stubs(:translate).with(key).returns(expected)
-        assert_equal expected, @controller.t(key)
+        assert_equal 'bar', @controller.t('one.two')
       end
 
       def test_localize
-- 
cgit v1.2.3


From fde7344542a76e7f1f95a2265ac5480a1ef9aeed Mon Sep 17 00:00:00 2001
From: Max Melentiev <melentievm@gmail.com>
Date: Tue, 22 Oct 2013 18:14:50 +0400
Subject: ActionController#translate also lookups shortcut without action name

---
 actionpack/test/abstract/translation_test.rb | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'actionpack/test')

diff --git a/actionpack/test/abstract/translation_test.rb b/actionpack/test/abstract/translation_test.rb
index d43a445535..8289252dfc 100644
--- a/actionpack/test/abstract/translation_test.rb
+++ b/actionpack/test/abstract/translation_test.rb
@@ -19,10 +19,12 @@ module AbstractController
                 index: {
                   foo: 'bar',
                 },
+                no_action: 'no_action_tr',
               },
             },
           },
         })
+        @controller.stubs(action_name: :index)
       end
 
       def test_action_controller_base_responds_to_translate
@@ -42,15 +44,17 @@ module AbstractController
       end
 
       def test_lazy_lookup
-        @controller.stubs(action_name: :index)
         assert_equal 'bar', @controller.t('.foo')
       end
 
       def test_lazy_lookup_with_symbol
-        @controller.stubs(action_name: :index)
         assert_equal 'bar', @controller.t(:'.foo')
       end
 
+      def test_lazy_lookup_fallback
+        assert_equal 'no_action_tr', @controller.t(:'.no_action')
+      end
+
       def test_default_translation
         assert_equal 'bar', @controller.t('one.two')
       end
-- 
cgit v1.2.3