diff options
| author | wycats <wycats@gmail.com> | 2010-09-11 03:24:50 -0500 |
|---|---|---|
| committer | wycats <wycats@gmail.com> | 2010-09-11 03:24:50 -0500 |
| commit | f6153f74da29f56017d5ddb8a2b8869d9b5835d7 (patch) | |
| tree | 39de2f1a37cc755ed0e0950c012b47c61427bf83 /actionpack/test/dispatch | |
| parent | 477df63433d8543ae8568de149e70d1bf1b41bb8 (diff) | |
| parent | 497b6af8818f656fdbca9ed2470c1c16ae5ff1cd (diff) | |
| download | rails-f6153f74da29f56017d5ddb8a2b8869d9b5835d7.tar.gz rails-f6153f74da29f56017d5ddb8a2b8869d9b5835d7.tar.bz2 rails-f6153f74da29f56017d5ddb8a2b8869d9b5835d7.zip | |
Merge remote branch 'drogus/engines'
Diffstat (limited to 'actionpack/test/dispatch')
| -rw-r--r-- | actionpack/test/dispatch/prefix_generation_test.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/actionpack/test/dispatch/prefix_generation_test.rb b/actionpack/test/dispatch/prefix_generation_test.rb index 3b47a1b72d..26d76557dd 100644 --- a/actionpack/test/dispatch/prefix_generation_test.rb +++ b/actionpack/test/dispatch/prefix_generation_test.rb @@ -72,7 +72,7 @@ module TestGenerationPrefix class ::InsideEngineGeneratingController < ActionController::Base include BlogEngine.routes.url_helpers - include RailsApplication.routes.mounted_helpers(:app) + include RailsApplication.routes.mounted_helpers def index render :text => posts_path @@ -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 |