Get rid of mocha tests - part 1

1 files changed, 15 insertions, 7 deletions

diff --git a/actionpack/test/abstract/translation_test.rb b/actionpack/test/abstract/translation_test.rb
index 8289252dfc..1435928578 100644
--- a/actionpack/test/abstract/translation_test.rb
+++ b/actionpack/test/abstract/translation_test.rb
@@ -24,7 +24,6 @@ module AbstractController
             },
           },
         })
-        @controller.stubs(action_name: :index)
       end
 
       def test_action_controller_base_responds_to_translate
@@ -44,25 +43,34 @@ module AbstractController
       end
 
       def test_lazy_lookup
-        assert_equal 'bar', @controller.t('.foo')
+        @controller.stub :action_name, :index do
+          assert_equal 'bar', @controller.t('.foo')
+        end
       end
 
       def test_lazy_lookup_with_symbol
-        assert_equal 'bar', @controller.t(:'.foo')
+        @controller.stub :action_name, :index do
+          assert_equal 'bar', @controller.t(:'.foo')
+        end
       end
 
       def test_lazy_lookup_fallback
-        assert_equal 'no_action_tr', @controller.t(:'.no_action')
+        @controller.stub :action_name, :index do
+          assert_equal 'no_action_tr', @controller.t(:'.no_action')
+        end
       end
 
       def test_default_translation
-        assert_equal 'bar', @controller.t('one.two')
+        @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