Merge pull request #9007 from dpree/master

Enhanced tests for AbstractController::Translation module

1 files changed, 46 insertions, 35 deletions

diff --git a/actionpack/test/abstract/translation_test.rb b/actionpack/test/abstract/translation_test.rb
index 99064a8b87..35e7fd69b5 100644
--- a/actionpack/test/abstract/translation_test.rb
+++ b/actionpack/test/abstract/translation_test.rb
@@ -1,39 +1,50 @@
 require 'abstract_unit'
 
-# class TranslatingController < ActionController::Base
-# end
-
-class TranslationControllerTest < ActiveSupport::TestCase
-  def setup
-    @controller = ActionController::Base.new
-  end
-
-  def test_action_controller_base_responds_to_translate
-    assert_respond_to @controller, :translate
-  end
-
-  def test_action_controller_base_responds_to_t
-    assert_respond_to @controller, :t
-  end
-
-  def test_action_controller_base_responds_to_localize
-    assert_respond_to @controller, :localize
-  end
-
-  def test_action_controller_base_responds_to_l
-    assert_respond_to @controller, :l
-  end
-
-  def test_lazy_lookup
-    expected = 'bar'
-    @controller.stubs(:action_name => :index)
-    I18n.stubs(:translate).with('action_controller.base.index.foo').returns(expected)
-    assert_equal expected, @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)
+module AbstractController
+  module Testing
+    class TranslationController < AbstractController::Base
+      include AbstractController::Translation
+    end
+
+    class TranslationControllerTest < ActiveSupport::TestCase
+      def setup
+        @controller = TranslationController.new
+      end
+
+      def test_action_controller_base_responds_to_translate
+        assert_respond_to @controller, :translate
+      end
+
+      def test_action_controller_base_responds_to_t
+        assert_respond_to @controller, :t
+      end
+
+      def test_action_controller_base_responds_to_localize
+        assert_respond_to @controller, :localize
+      end
+
+      def test_action_controller_base_responds_to_l
+        assert_respond_to @controller, :l
+      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')
+      end
+
+      def test_default_translation
+        key, expected = 'one.two' 'bar'
+        I18n.stubs(:translate).with(key).returns(expected)
+        assert_equal expected, @controller.t(key)
+      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)
+      end
+    end
   end
 end