1 files changed, 42 insertions, 8 deletions
diff --git a/actionpack/test/journey/router_test.rb b/actionpack/test/journey/router_test.rb
index 2e7e8e1bea..19c61b5914 100644
--- a/actionpack/test/journey/router_test.rb
+++ b/actionpack/test/journey/router_test.rb
@@ -201,6 +201,16 @@ module ActionDispatch
         assert_match(/missing required keys: \[:id\]/, error.message)
       end
 
+      def test_does_not_include_missing_keys_message
+        route_name = "gorby_thunderhorse"
+
+        error = assert_raises(ActionController::UrlGenerationError) do
+          @formatter.generate(route_name, { }, { })
+        end
+
+        assert_no_match(/missing required keys: \[\]/, error.message)
+      end
+
       def test_X_Cascade
         add_routes @router, [ "/messages(.:format)" ]
         resp = @router.serve(rails_env({ 'REQUEST_METHOD' => 'GET', 'PATH_INFO' => '/lol' }))
@@ -405,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",
@@ -503,6 +513,25 @@ module ActionDispatch
         assert called
       end
 
+      def test_recognize_head_route
+        path   = Path::Pattern.from_string "/books(/:action(.:format))"
+        app    = Object.new
+        conditions = { request_method: 'HEAD' }
+        @router.routes.add_route(app, path, conditions, {})
+
+        env = rails_env(
+          'PATH_INFO' => '/books/list.rss',
+          'REQUEST_METHOD' => 'HEAD'
+        )
+
+        called = false
+        @router.recognize(env) do |r, params|
+          called = true
+        end
+
+        assert called
+      end
+
       def test_recognize_head_request_as_get_route
         path   = Path::Pattern.from_string "/books(/:action(.:format))"
         app    = Object.new
@@ -525,19 +554,24 @@ module ActionDispatch
       def test_recognize_cares_about_verbs
         path   = Path::Pattern.from_string "/books(/:action(.:format))"
         app    = Object.new
-        conditions = {
-          :request_method => 'GET'
-        }
+        conditions = { request_method: 'GET' }
         @router.routes.add_route(app, path, conditions, {})
 
+        env = rails_env 'PATH_INFO' => '/books/list.rss',
+                        "REQUEST_METHOD" => "POST"
+
+        called = false
+        @router.recognize(env) do |r, params|
+          called = true
+        end
+
+        assert_not called
+
         conditions = conditions.dup
         conditions[:request_method] = 'POST'
 
         post = @router.routes.add_route(app, path, conditions, {})
 
-        env = rails_env 'PATH_INFO' => '/books/list.rss',
-                        "REQUEST_METHOD"    => "POST"
-
         called = false
         @router.recognize(env) do |r, params|
           assert_equal post, r
@@ -561,7 +595,7 @@ module ActionDispatch
       end
 
       def rails_env env, klass = ActionDispatch::Request
-        klass.new env
+        klass.new(rack_env(env))
       end
 
       def rack_env env