From f29ce1f35670866cb86faedeabb28a33215a143f Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Wed, 13 Jul 2005 02:12:00 +0000 Subject: r3023@asus: jeremy | 2005-07-12 23:43:39 -0700 Remove superfluous inherited override in Dependencies. r3024@asus: jeremy | 2005-07-12 23:54:28 -0700 Make test the default railties rake target. r3025@asus: jeremy | 2005-07-12 23:55:27 -0700 Encapsulate dispatch call in dispatcher test. r3026@asus: jeremy | 2005-07-12 23:56:14 -0700 Expand dispatcher mock to match full method signature for process. r3027@asus: jeremy | 2005-07-12 23:57:24 -0700 Look for app-specific generators in RAILS_ROOT/generators instead of RAILS_ROOT/script/generators. r3028@asus: jeremy | 2005-07-13 00:00:47 -0700 Update changelog. git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1819 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- railties/test/dispatcher_test.rb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'railties/test/dispatcher_test.rb') diff --git a/railties/test/dispatcher_test.rb b/railties/test/dispatcher_test.rb index ba41b93b24..caf36fc9e9 100644 --- a/railties/test/dispatcher_test.rb +++ b/railties/test/dispatcher_test.rb @@ -35,7 +35,7 @@ class DispatcherTest < Test::Unit::TestCase def test_ac_subclasses_cleared_on_reset Object.class_eval(ACTION_CONTROLLER_DEF) assert_equal 1, ActionController::Base.subclasses.length - Dispatcher.dispatch(CGI.new, ActionController::CgiRequest::DEFAULT_SESSION_OPTIONS, @output) + dispatch GC.start # force the subclass to be collected assert_equal 0, ActionController::Base.subclasses.length @@ -44,13 +44,16 @@ class DispatcherTest < Test::Unit::TestCase def test_am_subclasses_cleared_on_reset Object.class_eval(ACTION_MAILER_DEF) assert_equal 1, ActionMailer::Base.subclasses.length - Dispatcher.dispatch(CGI.new, ActionController::CgiRequest::DEFAULT_SESSION_OPTIONS, @output) + dispatch GC.start # force the subclass to be collected assert_equal 0, ActionMailer::Base.subclasses.length end private + def dispatch + Dispatcher.dispatch(CGI.new, ActionController::CgiRequest::DEFAULT_SESSION_OPTIONS, @output) + end def setup_minimal_environment value = Dependencies::LoadingModule.root -- cgit v1.2.3