From 28cf77203b0b5af648e441b5d9cfb75863ba2f39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Thu, 9 Dec 2010 13:15:25 +0100
Subject: Check if the routes object really responds to define_mount_prefix.

---
 actionpack/lib/action_dispatch/routing/mapper.rb |  2 +-
 actionpack/test/dispatch/mount_test.rb           | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index 5a38158e9f..47de5848fa 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -327,7 +327,7 @@ module ActionDispatch
           end
 
           def define_generate_prefix(app, name)
-            return unless app.respond_to?(:routes)
+            return unless app.respond_to?(:routes) && app.routes.respond_to?(:define_mounted_helper)
 
             _route = @set.named_routes.routes[name.to_sym]
             _routes = @set
diff --git a/actionpack/test/dispatch/mount_test.rb b/actionpack/test/dispatch/mount_test.rb
index 0f584af31e..1a032539b9 100644
--- a/actionpack/test/dispatch/mount_test.rb
+++ b/actionpack/test/dispatch/mount_test.rb
@@ -2,6 +2,17 @@ require 'abstract_unit'
 
 class TestRoutingMount < ActionDispatch::IntegrationTest
   Router = ActionDispatch::Routing::RouteSet.new
+
+  class FakeEngine
+    def self.routes
+      Object.new
+    end
+
+    def self.call(env)
+      [200, {"Content-Type" => "text/html"}, ["OK"]]
+    end
+  end
+
   Router.draw do
     SprocketsApp = lambda { |env|
       [200, {"Content-Type" => "text/html"}, ["#{env["SCRIPT_NAME"]} -- #{env["PATH_INFO"]}"]]
@@ -10,6 +21,8 @@ class TestRoutingMount < ActionDispatch::IntegrationTest
     mount SprocketsApp, :at => "/sprockets"
     mount SprocketsApp => "/shorthand"
 
+    mount FakeEngine, :at => "/fakeengine"
+
     scope "/its_a" do
       mount SprocketsApp, :at => "/sprocket"
     end
@@ -33,4 +46,9 @@ class TestRoutingMount < ActionDispatch::IntegrationTest
     get "/shorthand/omg"
     assert_equal "/shorthand -- /omg", response.body
   end
+
+  def test_with_fake_engine_does_not_call_invalid_method
+    get "/fakeengine"
+    assert_equal "OK", response.body
+  end
 end
\ No newline at end of file
-- 
cgit v1.2.3