diff options
| author | Emilio Tagua <miloops@gmail.com> | 2009-08-27 15:56:16 -0300 |
|---|---|---|
| committer | Emilio Tagua <miloops@gmail.com> | 2009-08-27 15:56:16 -0300 |
| commit | d395391e1dfae4531671fbb09911e6b9418474ba (patch) | |
| tree | 65d679e11c15de32c18a4303d6dcb9f88f2a0925 /actionpack/lib/action_controller/testing | |
| parent | 286f47f3b034db4550110b9a0f9ff48dda29e807 (diff) | |
| parent | c10396b1426fcddea35d88fe865846b8aaab5de4 (diff) | |
| download | rails-d395391e1dfae4531671fbb09911e6b9418474ba.tar.gz rails-d395391e1dfae4531671fbb09911e6b9418474ba.tar.bz2 rails-d395391e1dfae4531671fbb09911e6b9418474ba.zip | |
Merge commit 'rails/master'
Diffstat (limited to 'actionpack/lib/action_controller/testing')
| -rw-r--r-- | actionpack/lib/action_controller/testing/process.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/testing/process.rb b/actionpack/lib/action_controller/testing/process.rb index 6bc7d60d76..4185b803c5 100644 --- a/actionpack/lib/action_controller/testing/process.rb +++ b/actionpack/lib/action_controller/testing/process.rb @@ -249,6 +249,7 @@ module ActionController #:nodoc: temporary_routes = ActionController::Routing::RouteSet.new ActionController::Routing.module_eval { const_set :Routes, temporary_routes } + ActionController::Dispatcher.router = temporary_routes yield temporary_routes ensure @@ -256,6 +257,7 @@ module ActionController #:nodoc: ActionController::Routing.module_eval { remove_const :Routes } end ActionController::Routing.const_set(:Routes, real_routes) if real_routes + ActionController::Dispatcher.router = ActionController::Routing::Routes end end -end
\ No newline at end of file +end |