diff options
| author | Joshua Peek <josh@joshpeek.com> | 2009-09-26 21:38:48 -0500 |
|---|---|---|
| committer | Joshua Peek <josh@joshpeek.com> | 2009-09-26 21:38:48 -0500 |
| commit | 14866fa3d83676d340d94464f50e2e0ea989c3c1 (patch) | |
| tree | d44a15b1b57fbba70a218221bbdbc6694e4f94eb /actionpack/test/controller/dispatcher_test.rb | |
| parent | b0506b086fa1b59b072aaf7de99f01846fce10a4 (diff) | |
| download | rails-14866fa3d83676d340d94464f50e2e0ea989c3c1.tar.gz rails-14866fa3d83676d340d94464f50e2e0ea989c3c1.tar.bz2 rails-14866fa3d83676d340d94464f50e2e0ea989c3c1.zip | |
Allow setting a default application for all integration tests
Diffstat (limited to 'actionpack/test/controller/dispatcher_test.rb')
| -rw-r--r-- | actionpack/test/controller/dispatcher_test.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/actionpack/test/controller/dispatcher_test.rb b/actionpack/test/controller/dispatcher_test.rb index 8d974cb745..7ef2564e5a 100644 --- a/actionpack/test/controller/dispatcher_test.rb +++ b/actionpack/test/controller/dispatcher_test.rb @@ -22,7 +22,6 @@ class DispatcherTest < Test::Unit::TestCase def teardown Dispatcher.router = @old_router - @dispatcher = nil ENV.delete 'REQUEST_METHOD' end @@ -79,7 +78,7 @@ class DispatcherTest < Test::Unit::TestCase ActionController::Dispatcher.prepare_each_request = false Dispatcher.define_dispatcher_callbacks(cache_classes) - @dispatcher ||= Dispatcher.new + @dispatcher ||= ActionDispatch::Callbacks.new(Dispatcher.router) @dispatcher.call({'rack.input' => StringIO.new(''), 'action_dispatch.show_exceptions' => false}) end |