Add some tests to collector with templates and any.

2 files changed, 2 insertions, 3 deletions

diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb
index 5e61b8693a..4ab3761807 100644
--- a/actionmailer/lib/action_mailer/base.rb
+++ b/actionmailer/lib/action_mailer/base.rb
@@ -2,6 +2,7 @@ require 'active_support/core_ext/class'
 require 'active_support/core_ext/module/delegation'
 require 'mail'
 require 'action_mailer/tmail_compat'
+require 'action_mailer/collector'
 
 module ActionMailer #:nodoc:
   # Action Mailer allows you to send email from your application using a mailer model and views.
@@ -442,7 +443,6 @@ module ActionMailer #:nodoc:
       end
 
       content_type ||= create_parts_from_responses(m, responses, charset)
-
       m.content_type = content_type
       m.charset      = charset
       m.mime_version = mime_version
diff --git a/actionmailer/lib/action_mailer/collector.rb b/actionmailer/lib/action_mailer/collector.rb
index 0891b6f123..5431efccfe 100644
--- a/actionmailer/lib/action_mailer/collector.rb
+++ b/actionmailer/lib/action_mailer/collector.rb
@@ -14,11 +14,10 @@ module ActionMailer #:nodoc:
       @default_formats = context.formats
     end
 
-    # TODO Test me
     def any(*args, &block)
       options = args.extract_options!
       raise "You have to supply at least one format" if args.empty?
-      args.each { |type| send(type, options, &block) }
+      args.each { |type| send(type, options.dup, &block) }
     end
     alias :all :any