6 files changed, 58 insertions, 4 deletions
diff --git a/actionpack/test/controller/routing_test.rb b/actionpack/test/controller/routing_test.rb
index aca9f03748..f46b32e019 100644
--- a/actionpack/test/controller/routing_test.rb
+++ b/actionpack/test/controller/routing_test.rb
@@ -1386,7 +1386,7 @@ class RouteSetTest < ActiveSupport::TestCase
     url = controller.url_for({ :controller => "connection", :only_path => true })
     assert_equal "/connection/connection", url
 
-    url = controller.url_for({ :use_route => :family_connection,
+    url = controller.url_for({ :use_route => "family_connection",
                                :controller => "connection", :only_path => true })
     assert_equal "/connection", url
   end
diff --git a/actionpack/test/controller/test_case_test.rb b/actionpack/test/controller/test_case_test.rb
index fdabad3abd..ba2ff7d12c 100644
--- a/actionpack/test/controller/test_case_test.rb
+++ b/actionpack/test/controller/test_case_test.rb
@@ -528,7 +528,7 @@ XML
         get 'via_named_route', as: :a_named_route, to: 'test_case_test/test#test_uri'
       end
 
-      get :test_uri, use_route: :a_named_route
+      assert_deprecated { get :test_uri, use_route: :a_named_route }
       assert_equal '/via_named_route', @response.body
     end
   end
@@ -798,7 +798,7 @@ module EngineControllerTests
       with_routing do |set|
         set.draw { mount Engine => '/foo' }
 
-        get :index, use_route: :foo
+        assert_deprecated { get :index, use_route: :foo }
         assert_equal @response.body, 'bar'
       end
     end
diff --git a/actionpack/test/controller/url_for_test.rb b/actionpack/test/controller/url_for_test.rb
index f0eba17556..0ffa2d2a03 100644
--- a/actionpack/test/controller/url_for_test.rb
+++ b/actionpack/test/controller/url_for_test.rb
@@ -290,6 +290,13 @@ module AbstractController
         end
       end
 
+      def test_using_nil_script_name_properly_concats_with_original_script_name
+        add_host!
+        assert_equal('https://www.basecamphq.com/subdir/c/a/i',
+          W.new.url_for(:controller => 'c', :action => 'a', :id => 'i', :protocol => 'https', :script_name => nil, :original_script_name => '/subdir')
+        )
+      end
+
       def test_only_path
         with_routing do |set|
           set.draw do
diff --git a/actionpack/test/dispatch/debug_exceptions_test.rb b/actionpack/test/dispatch/debug_exceptions_test.rb
index f8851f0152..5e87744f6b 100644
--- a/actionpack/test/dispatch/debug_exceptions_test.rb
+++ b/actionpack/test/dispatch/debug_exceptions_test.rb
@@ -43,6 +43,8 @@ class DebugExceptionsTest < ActionDispatch::IntegrationTest
         raise ActionController::InvalidAuthenticityToken
       when "/not_found_original_exception"
         raise ActionView::Template::Error.new('template', AbstractController::ActionNotFound.new)
+      when "/missing_template"
+        raise ActionView::MissingTemplate.new(%w(foo), 'foo/index', %w(foo), false, 'mailer')
       when "/bad_request"
         raise ActionController::BadRequest
       when "/missing_keys"
@@ -120,6 +122,15 @@ class DebugExceptionsTest < ActionDispatch::IntegrationTest
     assert_no_match '&lt;|&gt;', routing_table, "there should not be escaped html in the output"
   end
 
+  test 'displays request and response info when a RoutingError occurs' do
+    @app = DevelopmentApp
+
+    get "/pass", {}, {'action_dispatch.show_exceptions' => true}
+
+    assert_select 'h2', /Request/
+    assert_select 'h2', /Response/
+  end
+
   test "rescue with diagnostics message" do
     @app = DevelopmentApp
 
@@ -275,6 +286,22 @@ class DebugExceptionsTest < ActionDispatch::IntegrationTest
     end
   end
 
+  test 'display backtrace on template missing errors' do
+    @app = DevelopmentApp
+
+    get "/missing_template", nil, {}
+
+    assert_select "header h1", /Template is missing/
+
+    assert_select "#container h2", /^Missing template/
+
+    assert_select '#Application-Trace'
+    assert_select '#Framework-Trace'
+    assert_select '#Full-Trace'
+
+    assert_select 'h2', /Request/
+  end
+
   test 'display backtrace when error type is SyntaxError wrapped by ActionView::Template::Error' do
     @app = DevelopmentApp
 
diff --git a/actionpack/test/dispatch/routing/route_set_test.rb b/actionpack/test/dispatch/routing/route_set_test.rb
index a7acc0de41..5a39119446 100644
--- a/actionpack/test/dispatch/routing/route_set_test.rb
+++ b/actionpack/test/dispatch/routing/route_set_test.rb
@@ -160,6 +160,26 @@ module ActionDispatch
         assert_equal '/foo/1/bar/2', url_helpers.foo_bar_path(2, foo_id: 1)
       end
 
+      test "stringified controller and action keys are properly symbolized" do
+        draw do
+          root 'foo#bar'
+        end
+
+        assert_deprecated do
+          assert_equal '/', url_helpers.root_path('controller' => 'foo', 'action' => 'bar')
+        end
+      end
+
+      test "mix of string and symbol keys are properly symbolized" do
+        draw do
+          root 'foo#bar'
+        end
+
+        assert_deprecated do
+          assert_equal '/', url_helpers.root_path('controller' => 'foo', :action => 'bar')
+        end
+      end
+
       private
         def draw(&block)
           @set.draw(&block)
diff --git a/actionpack/test/journey/router_test.rb b/actionpack/test/journey/router_test.rb
index fbac86e8ca..19c61b5914 100644
--- a/actionpack/test/journey/router_test.rb
+++ b/actionpack/test/journey/router_test.rb
@@ -415,7 +415,7 @@ module ActionDispatch
 
       def test_generate_with_name
         path  = Path::Pattern.from_string '/:controller(/:action)'
-        @router.routes.add_route @app, path, {}, {}, {}
+        @router.routes.add_route @app, path, {}, {}, "tasks"
 
         path, params = @formatter.generate(
           "tasks",