Permalink
Browse files

ActionMailer::Base subclasses are reloaded with other rails components

…#1262

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1492 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent 0c3298f commit 0d8455c1a285c6d58fc7a3180f5c72d9c3c42fa1 @jamis jamis committed Jun 24, 2005
Showing with 66 additions and 0 deletions.
  1. +2 −0 railties/CHANGELOG
  2. +1 −0 railties/lib/dispatcher.rb
  3. +63 −0 railties/test/dispatcher_test.rb
View
2 railties/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* ActionMailer::Base subclasses are reloaded with the other rails components #1262
+
* Made the WEBrick adapter not use a mutex around action performance if ActionController::Base.allow_concurrency is true (default is false)
* Fixed that mailer generator generated fixtures/plural while units expected fixtures/singular #1457 [Scott Barron]
View
1 railties/lib/dispatcher.rb
@@ -49,6 +49,7 @@ def reset_application
Controllers.clear!
Dependencies.clear
Dependencies.remove_subclasses_for(ActiveRecord::Base, ActiveRecord::Observer, ActionController::Base)
+ Dependencies.remove_subclasses_for(ActionMailer::Base) if defined?(ActionMailer::Base)
end
Breakpoint.deactivate_drb if defined?(BREAKPOINT_SERVER_PORT)
View
63 railties/test/dispatcher_test.rb
@@ -0,0 +1,63 @@
+$:.unshift File.dirname(__FILE__) + "/../lib"
+$:.unshift File.dirname(__FILE__) + "/../../actionpack/lib"
+$:.unshift File.dirname(__FILE__) + "/../../actionmailer/lib"
+
+require 'test/unit'
+require 'stringio'
+require 'cgi'
+
+require 'dispatcher'
+require 'action_controller'
+require 'action_mailer'
+
+ACTION_MAILER_DEF = <<AM
+ class DispatcherTestMailer < ActionMailer::Base
+ end
+AM
+
+ACTION_CONTROLLER_DEF = <<AM
+ class DispatcherControllerTest < ActionController::Base
+ end
+AM
+
+class DispatcherTest < Test::Unit::TestCase
+ def setup
+ @output = StringIO.new
+ ENV['REQUEST_METHOD'] = "GET"
+ setup_minimal_environment
+ end
+
+ def teardown
+ ENV['REQUEST_METHOD'] = nil
+ teardown_minimal_environment
+ end
+
+ 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)
+
+ GC.start # force the subclass to be collected
+ assert_equal 0, ActionController::Base.subclasses.length
+ end
+
+ 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)
+
+ GC.start # force the subclass to be collected
+ assert_equal 0, ActionMailer::Base.subclasses.length
+ end
+
+ private
+
+ def setup_minimal_environment
+ value = Dependencies::LoadingModule.root
+ Object.const_set("Controllers", value)
+ end
+
+ def teardown_minimal_environment
+ Object.send(:remove_const, "Controllers")
+ end
+end

0 comments on commit 0d8455c

Please sign in to comment.