3 files changed, 10 insertions, 12 deletions
diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb
index 60e2cea8a2..fa0b6087ba 100644
--- a/actionpack/test/abstract_unit.rb
+++ b/actionpack/test/abstract_unit.rb
@@ -122,7 +122,7 @@ class ActionDispatch::IntegrationTest < ActiveSupport::TestCase
   class StubDispatcher < ::ActionDispatch::Routing::RouteSet::Dispatcher
     protected
     def controller_reference(controller_param)
-      controller_param
+      controller_param.params[:controller]
     end
 
     def dispatch(controller, action, env)
diff --git a/actionpack/test/controller/routing_test.rb b/actionpack/test/controller/routing_test.rb
index a333290ade..feb3e7eab7 100644
--- a/actionpack/test/controller/routing_test.rb
+++ b/actionpack/test/controller/routing_test.rb
@@ -327,12 +327,6 @@ class LegacyRouteSetTests < ActiveSupport::TestCase
     assert_equal '/stuff', controller.url_for({ :controller => '/stuff', :only_path => true })
   end
 
-  def test_ignores_leading_slash
-    rs.clear!
-    rs.draw { get '/:controller(/:action(/:id))'}
-    test_default_setup
-  end
-
   def test_route_with_colon_first
     rs.draw do
       get '/:controller/:action/:id', action: 'index', id: nil
diff --git a/actionpack/test/dispatch/header_test.rb b/actionpack/test/dispatch/header_test.rb
index e2b38c23bc..79600b654b 100644
--- a/actionpack/test/dispatch/header_test.rb
+++ b/actionpack/test/dispatch/header_test.rb
@@ -1,15 +1,19 @@
 require "abstract_unit"
 
 class HeaderTest < ActiveSupport::TestCase
+  def make_headers(hash)
+    ActionDispatch::Http::Headers.new ActionDispatch::Request.new hash
+  end
+
   setup do
-    @headers = ActionDispatch::Http::Headers.new(
+    @headers = make_headers(
       "CONTENT_TYPE" => "text/plain",
       "HTTP_REFERER" => "/some/page"
     )
   end
 
   test "#new does not normalize the data" do
-    headers = ActionDispatch::Http::Headers.new(
+    headers = make_headers(
       "Content-Type" => "application/json",
       "HTTP_REFERER" => "/some/page",
       "Host" => "http://test.com")
@@ -108,7 +112,7 @@ class HeaderTest < ActiveSupport::TestCase
   end
 
   test "env variables with . are not modified" do
-    headers = ActionDispatch::Http::Headers.new
+    headers = make_headers({})
     headers.merge! "rack.input" => "",
      "rack.request.cookie_hash" => "",
      "action_dispatch.logger" => ""
@@ -119,7 +123,7 @@ class HeaderTest < ActiveSupport::TestCase
   end
 
   test "symbols are treated as strings" do
-    headers = ActionDispatch::Http::Headers.new
+    headers = make_headers({})
     headers.merge!(:SERVER_NAME => "example.com",
                    "HTTP_REFERER" => "/",
                    :Host => "test.com")
@@ -130,7 +134,7 @@ class HeaderTest < ActiveSupport::TestCase
 
   test "headers directly modifies the passed environment" do
     env = {"HTTP_REFERER" => "/"}
-    headers = ActionDispatch::Http::Headers.new(env)
+    headers = make_headers(env)
     headers['Referer'] = "http://example.com/"
     headers.merge! "CONTENT_TYPE" => "text/plain"
     assert_equal({"HTTP_REFERER"=>"http://example.com/",