1 files changed, 36 insertions, 9 deletions
diff --git a/actionpack/test/abstract/translation_test.rb b/actionpack/test/abstract/translation_test.rb
index 4fdc480b43..1435928578 100644
--- a/actionpack/test/abstract/translation_test.rb
+++ b/actionpack/test/abstract/translation_test.rb
@@ -9,6 +9,21 @@ 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',
+                },
+                no_action: 'no_action_tr',
+              },
+            },
+          },
+        })
       end
 
       def test_action_controller_base_responds_to_translate
@@ -28,22 +43,34 @@ 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')
+        @controller.stub :action_name, :index do
+          assert_equal 'bar', @controller.t('.foo')
+        end
+      end
+
+      def test_lazy_lookup_with_symbol
+        @controller.stub :action_name, :index do
+          assert_equal 'bar', @controller.t(:'.foo')
+        end
+      end
+
+      def test_lazy_lookup_fallback
+        @controller.stub :action_name, :index do
+          assert_equal 'no_action_tr', @controller.t(:'.no_action')
+        end
       end
 
       def test_default_translation
-        key, expected = 'one.two', 'bar'
-        I18n.stubs(:translate).with(key).returns(expected)
-        assert_equal expected, @controller.t(key)
+        @controller.stub :action_name, :index do
+          assert_equal 'bar', @controller.t('one.two')
+        end
       end
 
       def test_localize
         time, expected = Time.gm(2000), 'Sat, 01 Jan 2000 00:00:00 +0000'
-        I18n.stubs(:localize).with(time).returns(expected)
-        assert_equal expected, @controller.l(time)
+        I18n.stub :localize, expected do
+          assert_equal expected, @controller.l(time)
+        end
       end
     end
   end