diff options
Diffstat (limited to 'actionpack')
-rw-r--r-- | actionpack/lib/action_dispatch/routing/route_set.rb | 2 | ||||
-rw-r--r-- | actionpack/test/dispatch/prefix_generation_test.rb | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb index 19a277a18c..835ba03784 100644 --- a/actionpack/lib/action_dispatch/routing/route_set.rb +++ b/actionpack/lib/action_dispatch/routing/route_set.rb @@ -262,7 +262,7 @@ module ActionDispatch module MountedHelpers end - def mounted_helpers(name = :app) + def mounted_helpers(name = :main_app) define_mounted_helper(name) if name MountedHelpers end diff --git a/actionpack/test/dispatch/prefix_generation_test.rb b/actionpack/test/dispatch/prefix_generation_test.rb index 1e2df682b3..26d76557dd 100644 --- a/actionpack/test/dispatch/prefix_generation_test.rb +++ b/actionpack/test/dispatch/prefix_generation_test.rb @@ -83,9 +83,9 @@ module TestGenerationPrefix end def url_to_application - path = app.url_for( :controller => "outside_engine_generating", - :action => "index", - :only_path => true) + path = main_app.url_for(:controller => "outside_engine_generating", + :action => "index", + :only_path => true) render :text => path end |