UrlGenerationError are not catched as 404 anymore

actionpack/lib/action_controller/metal/exceptions.rb

@@ -25,7 +25,7 @@ def initialize(message, failures=[])
     end
   end
 
-  class ActionController::UrlGenerationError < RoutingError #:nodoc:
+  class ActionController::UrlGenerationError < ActionControllerError #:nodoc:
   end
 
   class MethodNotAllowed < ActionControllerError #:nodoc:

railties/test/application/middleware/exceptions_test.rb

@@ -60,6 +60,21 @@ def index
       assert_equal "YOU FAILED BRO", last_response.body
     end
 
+    test "url generation error when action_dispatch.show_exceptions is set raises an exception" do
+      controller :foo, <<-RUBY
+        class FooController < ActionController::Base
+          def index
+            raise ActionController::UrlGenerationError
+          end
+        end
+      RUBY
+      
+      app.config.action_dispatch.show_exceptions = true
+
+      get '/foo'
+      assert_equal 500, last_response.status
+    end
+
     test "unspecified route when action_dispatch.show_exceptions is not set raises an exception" do
       app.config.action_dispatch.show_exceptions = false