aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2014-07-15 18:19:11 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2014-07-15 18:20:45 -0700
commit1ae9f056c5ea5c588ebdf8adce03d35efd049139 (patch)
treee03f6b360eeba4ecd75de4dfbd9bcb2dc5ab95c4 /actionpack/lib
parent002cf5fac4d71e77805c0e1dad3b9499b1f551ca (diff)
downloadrails-1ae9f056c5ea5c588ebdf8adce03d35efd049139.tar.gz
rails-1ae9f056c5ea5c588ebdf8adce03d35efd049139.tar.bz2
rails-1ae9f056c5ea5c588ebdf8adce03d35efd049139.zip
routed applications will respond to these methods
Diffstat (limited to 'actionpack/lib')
-rw-r--r--actionpack/lib/action_dispatch/routing/mapper.rb2
-rw-r--r--actionpack/lib/action_dispatch/testing/integration.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index cf8826eec6..6419c17be9 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -616,7 +616,7 @@ module ActionDispatch
end
def define_generate_prefix(app, name)
- return unless app.respond_to?(:routes) && app.routes.respond_to?(:define_mounted_helper)
+ return unless app.respond_to?(:routes)
_route = @set.named_routes.routes[name.to_sym]
_routes = @set
diff --git a/actionpack/lib/action_dispatch/testing/integration.rb b/actionpack/lib/action_dispatch/testing/integration.rb
index 08d4eee7fb..cb2cb10870 100644
--- a/actionpack/lib/action_dispatch/testing/integration.rb
+++ b/actionpack/lib/action_dispatch/testing/integration.rb
@@ -200,7 +200,7 @@ module ActionDispatch
@url_options ||= default_url_options.dup.tap do |url_options|
url_options.reverse_merge!(controller.url_options) if controller
- if @app.respond_to?(:routes) && @app.routes.respond_to?(:default_url_options)
+ if @app.respond_to?(:routes)
url_options.reverse_merge!(@app.routes.default_url_options)
end