aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/testing
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2009-09-26 21:59:28 -0500
committerJoshua Peek <josh@joshpeek.com>2009-09-26 21:59:28 -0500
commita6757a02e12aa584bd74dbcde18a7886be8e9029 (patch)
tree74d3ca8fe45d1bc031371e7735241fa265e42c67 /actionpack/lib/action_controller/testing
parent14866fa3d83676d340d94464f50e2e0ea989c3c1 (diff)
downloadrails-a6757a02e12aa584bd74dbcde18a7886be8e9029.tar.gz
rails-a6757a02e12aa584bd74dbcde18a7886be8e9029.tar.bz2
rails-a6757a02e12aa584bd74dbcde18a7886be8e9029.zip
Move middleware and route configuration from AC::Dispatcher to Rails application object
Diffstat (limited to 'actionpack/lib/action_controller/testing')
-rw-r--r--actionpack/lib/action_controller/testing/process.rb2
1 files changed, 0 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/testing/process.rb b/actionpack/lib/action_controller/testing/process.rb
index fd368a7d79..bbc7f3c8f9 100644
--- a/actionpack/lib/action_controller/testing/process.rb
+++ b/actionpack/lib/action_controller/testing/process.rb
@@ -99,7 +99,6 @@ 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
@@ -107,7 +106,6 @@ 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