From 8c180cdaf69f07eb0ffd502dfc6c82a0b0281c48 Mon Sep 17 00:00:00 2001 From: Jorge Bejar Date: Tue, 21 Apr 2015 00:16:48 -0300 Subject: Fix rake routes for api apps Signed-off-by: Santiago Pastorino --- actionpack/lib/action_dispatch/routing/inspector.rb | 6 +++++- actionpack/test/dispatch/routing/inspector_test.rb | 16 ++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) (limited to 'actionpack') diff --git a/actionpack/lib/action_dispatch/routing/inspector.rb b/actionpack/lib/action_dispatch/routing/inspector.rb index c513737fc2..bd6940fd47 100644 --- a/actionpack/lib/action_dispatch/routing/inspector.rb +++ b/actionpack/lib/action_dispatch/routing/inspector.rb @@ -45,7 +45,11 @@ module ActionDispatch end def internal? - controller.to_s =~ %r{\Arails/(info|mailers|welcome)} || path =~ %r{\A#{Rails.application.config.assets.prefix}\z} + internal_controller = controller.to_s =~ %r{\arails/(info|mailers|welcome)} + internal_asset = Rails.application.config.respond_to?(:assets) && + path =~ %r{\a#{Rails.application.config.assets.prefix}\z} + + internal_controller || internal_asset end def engine? diff --git a/actionpack/test/dispatch/routing/inspector_test.rb b/actionpack/test/dispatch/routing/inspector_test.rb index 3df022c64b..4047214843 100644 --- a/actionpack/test/dispatch/routing/inspector_test.rb +++ b/actionpack/test/dispatch/routing/inspector_test.rb @@ -313,6 +313,22 @@ module ActionDispatch assert_equal ["Prefix Verb URI Pattern Controller#Action", " GET /:controller(/:action) (?-mix:api\\/[^\\/]+)#:action"], output end + + def test_inspect_routes_shows_resources_route_when_assets_disabled + @set = ActionDispatch::Routing::RouteSet.new + app = ActiveSupport::OrderedOptions.new + + Rails.stubs(:application).returns(app) + + output = draw do + get '/cart', to: 'cart#show' + end + + assert_equal [ + "Prefix Verb URI Pattern Controller#Action", + " cart GET /cart(.:format) cart#show" + ], output + end end end end -- cgit v1.2.3