diff options
author | José Valim <jose.valim@gmail.com> | 2010-07-02 19:13:00 +0200 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2010-07-02 19:13:00 +0200 |
commit | 9e6e64873243ee707ecad3d523ceb0dbae0617cd (patch) | |
tree | bc3cf0338ab01a3d6b74e6ee42d4dcc8203fa5ae /actionpack/test/abstract_unit.rb | |
parent | 0189fb76e3c38ef9a0d292135683b0d135c4a369 (diff) | |
download | rails-9e6e64873243ee707ecad3d523ceb0dbae0617cd.tar.gz rails-9e6e64873243ee707ecad3d523ceb0dbae0617cd.tar.bz2 rails-9e6e64873243ee707ecad3d523ceb0dbae0617cd.zip |
Fix routes with :controller segment when namespaced [#5034 state:resolved]
Diffstat (limited to 'actionpack/test/abstract_unit.rb')
-rw-r--r-- | actionpack/test/abstract_unit.rb | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb index 89c4cb46a1..5be47f7c96 100644 --- a/actionpack/test/abstract_unit.rb +++ b/actionpack/test/abstract_unit.rb @@ -182,13 +182,16 @@ class ActionController::IntegrationTest < ActiveSupport::TestCase self.app = build_app - class StubDispatcher - def self.new(*args) - lambda { |env| - params = env['action_dispatch.request.path_parameters'] - controller, action = params[:controller], params[:action] - [200, {'Content-Type' => 'text/html'}, ["#{controller}##{action}"]] - } + # Stub Rails dispatcher so it does not get controller references and + # simply return the controller#action as Rack::Body. + class StubDispatcher < ::ActionDispatch::Routing::RouteSet::Dispatcher + protected + def controller_reference(controller_param) + controller_param + end + + def dispatch(controller, action, env) + [200, {'Content-Type' => 'text/html'}, ["#{controller}##{action}"]] end end |