3 files changed, 12 insertions, 13 deletions
diff --git a/actionpack/test/template/asset_tag_helper_test.rb b/actionpack/test/template/asset_tag_helper_test.rb
index e88a3591d8..d93433deac 100644
--- a/actionpack/test/template/asset_tag_helper_test.rb
+++ b/actionpack/test/template/asset_tag_helper_test.rb
@@ -481,7 +481,7 @@ class AssetTagHelperTest < ActionView::TestCase
   end
 
   def test_timebased_asset_id
-    expected_time = File.stat(File.expand_path(File.dirname(__FILE__) + "/../fixtures/public/images/rails.png")).mtime.to_i.to_s
+    expected_time = File.mtime(File.expand_path(File.dirname(__FILE__) + "/../fixtures/public/images/rails.png")).to_i.to_s
     assert_equal %(<img alt="Rails" src="/images/rails.png?#{expected_time}" />), image_tag("rails.png")
   end
 
@@ -512,7 +512,7 @@ class AssetTagHelperTest < ActionView::TestCase
 
   def test_timebased_asset_id_with_relative_url_root
     @controller.config.relative_url_root = "/collaboration/hieraki"
-    expected_time = File.stat(File.expand_path(File.dirname(__FILE__) + "/../fixtures/public/images/rails.png")).mtime.to_i.to_s
+    expected_time = File.mtime(File.expand_path(File.dirname(__FILE__) + "/../fixtures/public/images/rails.png")).to_i.to_s
     assert_equal %(<img alt="Rails" src="#{@controller.config.relative_url_root}/images/rails.png?#{expected_time}" />), image_tag("rails.png")
   end
 
diff --git a/actionpack/test/template/sprockets_helper_test.rb b/actionpack/test/template/sprockets_helper_test.rb
index 1135c55ff0..3d7abc7e2a 100644
--- a/actionpack/test/template/sprockets_helper_test.rb
+++ b/actionpack/test/template/sprockets_helper_test.rb
@@ -4,22 +4,21 @@ require 'sprockets/helpers/rails_helper'
 require 'mocha'
 
 class SprocketsHelperTest < ActionView::TestCase
-  tests Sprockets::Helpers::RailsHelper
+  include Sprockets::Helpers::RailsHelper
 
   attr_accessor :assets
 
+  class MockRequest
+    def protocol() 'http://' end
+    def ssl?() false end
+    def host_with_port() 'localhost' end
+  end
+
   def setup
     super
 
-    @controller = BasicController.new
-
-    @request = Class.new do
-      def protocol() 'http://' end
-      def ssl?() false end
-      def host_with_port() 'localhost' end
-    end.new
-
-    @controller.request = @request
+    @controller         = BasicController.new
+    @controller.request = MockRequest.new
 
     @assets = Sprockets::Environment.new
     @assets.paths << FIXTURES.join("sprockets/app/javascripts")
diff --git a/actionpack/test/template/test_test.rb b/actionpack/test/template/test_test.rb
index 3d0bbba435..bf789cd8b7 100644
--- a/actionpack/test/template/test_test.rb
+++ b/actionpack/test/template/test_test.rb
@@ -39,7 +39,7 @@ class PeopleHelperTest < ActionView::TestCase
     with_test_route_set do
       person = mock(:name => "David")
       person.class.extend ActiveModel::Naming
-      _routes.url_helpers.expects(:hash_for_mocha_mock_path).with(person).returns("/people/1")
+      expects(:mocha_mock_path).with(person).returns("/people/1")
       assert_equal '<a href="/people/1">David</a>', link_to_person(person)
     end
   end