Merge branch 'master' of git://github.com/mikel/rails into mail

Conflicts:
	actionmailer/lib/action_mailer.rb

10 files changed, 180 insertions, 202 deletions

diff --git a/actionmailer/lib/action_mailer.rb b/actionmailer/lib/action_mailer.rb
index 0ca08e4d1f..55ddbb24f4 100644
--- a/actionmailer/lib/action_mailer.rb
+++ b/actionmailer/lib/action_mailer.rb
@@ -21,36 +21,27 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #++
 
-actionpack_path = "#{File.dirname(__FILE__)}/../../actionpack/lib"
-$:.unshift(actionpack_path) if File.directory?(actionpack_path)
+actionpack_path = File.expand_path('../../../actionpack/lib', __FILE__)
+$:.unshift(actionpack_path) if File.directory?(actionpack_path) && !$:.include?(actionpack_path)
+
 require 'action_controller'
 require 'action_view'
 
 module ActionMailer
-  def self.load_all!
-    [Base, Part, ::Text::Format, ::Net::SMTP]
-  end
-
-  autoload :AdvAttrAccessor, 'action_mailer/adv_attr_accessor'
-  autoload :DeprecatedBody, 'action_mailer/deprecated_body'
-  autoload :Base, 'action_mailer/base'
-  autoload :DeliveryMethod, 'action_mailer/delivery_method'
-  autoload :Part, 'action_mailer/part'
-  autoload :PartContainer, 'action_mailer/part_container'
-  autoload :Quoting, 'action_mailer/quoting'
-  autoload :TestCase, 'action_mailer/test_case'
-  autoload :TestHelper, 'action_mailer/test_helper'
-
+  extend ::ActiveSupport::Autoload
+
+  autoload :AdvAttrAccessor
+  autoload :Base
+  autoload :DeliveryMethod
+  autoload :DeprecatedBody
+  autoload :MailHelper
+  autoload :Quoting
+  autoload :TestCase
+  autoload :TestHelper
 end
 
 module Text
-  autoload :Format, 'action_mailer/vendor/text_format'
-end
+  extend ActiveSupport::Autoload
 
-module Net
-  autoload :SMTP, 'net/smtp'
+  autoload :Format, 'action_mailer/vendor/text_format'
 end
-
-autoload :MailHelper, 'action_mailer/mail_helper'
-
-require 'mail'
diff --git a/actionmailer/lib/action_mailer/adv_attr_accessor.rb b/actionmailer/lib/action_mailer/adv_attr_accessor.rb
index e77029afdd..be6b1feca9 100644
--- a/actionmailer/lib/action_mailer/adv_attr_accessor.rb
+++ b/actionmailer/lib/action_mailer/adv_attr_accessor.rb
@@ -1,29 +1,25 @@
 module ActionMailer
   module AdvAttrAccessor #:nodoc:
-    def self.included(base)
-      base.extend(ClassMethods)
-    end
-
-    module ClassMethods #:nodoc:
-      def adv_attr_accessor(*names)
-        names.each do |name|
-          ivar = "@#{name}"
+    def adv_attr_accessor(*names)
+      names.each do |name|
+        ivar = "@#{name}"
 
-          define_method("#{name}=") do |value|
-            instance_variable_set(ivar, value)
+        class_eval <<-ACCESSORS, __FILE__, __LINE__ + 1
+          def #{name}=(value)
+            #{ivar} = value
           end
 
-          define_method(name) do |*parameters|
-            raise ArgumentError, "expected 0 or 1 parameters" unless parameters.length <= 1
-            if parameters.empty?
-              if instance_variable_names.include?(ivar)
-                instance_variable_get(ivar)
-              end
+          def #{name}(*args)
+            raise ArgumentError, "expected 0 or 1 parameters" unless args.length <= 1
+            if args.empty?
+              #{ivar} if instance_variable_names.include?(#{ivar.inspect})
             else
-              instance_variable_set(ivar, parameters.first)
+              #{ivar} = args.first
             end
           end
-        end
+        ACCESSORS
+
+        self.protected_instance_variables << ivar if self.respond_to?(:protected_instance_variables)
       end
     end
   end
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb
index 3639992ce9..aea2498d4d 100644
--- a/actionmailer/lib/action_mailer/base.rb
+++ b/actionmailer/lib/action_mailer/base.rb
@@ -1,9 +1,9 @@
 require 'active_support/core_ext/class'
+require 'mail'
 
 module ActionMailer #:nodoc:
   # Action Mailer allows you to send email from your application using a mailer model and views.
   #
-  #
   # = Mailer Models
   #
   # To use Action Mailer, you need to create a mailer model.
@@ -22,7 +22,8 @@ module ActionMailer #:nodoc:
   #      bcc        ["bcc@example.com", "Order Watcher <watcher@example.com>"]
   #      from       "system@example.com"
   #      subject    "New account information"
-  #      body       :account => recipient
+  #
+  #      @account = recipient
   #    end
   #  end
   #
@@ -42,13 +43,6 @@ module ActionMailer #:nodoc:
   # address. Setting this is useful when you want delivery notifications sent to a different address than
   # the one in <tt>from</tt>.
   #
-  # The <tt>body</tt> method has special behavior. It takes a hash which generates an instance variable
-  # named after each key in the hash containing the value that that key points to.
-  #
-  # So, for example, <tt>body :account => recipient</tt> would result
-  # in an instance variable <tt>@account</tt> with the value of <tt>recipient</tt> being accessible in the
-  # view.
-  #
   #
   # = Mailer views
   #
@@ -68,7 +62,12 @@ module ActionMailer #:nodoc:
   # You can even use Action Pack helpers in these views. For example:
   #
   #   You got a new note!
-  #   <%= truncate(note.body, 25) %>
+  #   <%= truncate(@note.body, 25) %>
+  #
+  # If you need to access the subject, from or the recipients in the view, you can do that through mailer object:
+  #
+  #   You got a new note from <%= mailer.from %>!
+  #   <%= truncate(@note.body, 25) %>
   #
   #
   # = Generating URLs
@@ -250,29 +249,22 @@ module ActionMailer #:nodoc:
   #   <tt>["text/html", "text/enriched", "text/plain"]</tt>. Items that appear first in the array have higher priority in the mail client
   #   and appear last in the mime encoded message. You can also pick a different order from inside a method with
   #   +implicit_parts_order+.
-  class Base
-    include AdvAttrAccessor, Quoting
+  class Base < AbstractController::Base
+    include Quoting
+    extend  AdvAttrAccessor
 
-    include AbstractController::RenderingController
+    include AbstractController::Rendering
     include AbstractController::LocalizedCache
     include AbstractController::Layouts
-
     include AbstractController::Helpers
-    helper MailHelper
 
-    if Object.const_defined?(:ActionController)
-      include ActionController::UrlWriter
-    end
+    helper  ActionMailer::MailHelper
 
+    include ActionController::UrlWriter
     include ActionMailer::DeprecatedBody
 
     private_class_method :new #:nodoc:
 
-    class_inheritable_accessor :view_paths
-    self.view_paths = []
-
-    cattr_accessor :logger
-
     @@raise_delivery_errors = true
     cattr_accessor :raise_delivery_errors
 
@@ -291,10 +283,16 @@ module ActionMailer #:nodoc:
     @@default_mime_version = "1.0"
     cattr_accessor :default_mime_version
 
-    @@default_implicit_parts_order = [ "text/html", "text/enriched", "text/plain" ]
+    # This specifies the order that the parts of a multipart email will be.  Usually you put
+    # text/plain at the top so someone without a MIME capable email reader can read the plain
+    # text of your email first.
+    #
+    # Any content type that is not listed here will be inserted in the order you add them to
+    # the email after the content types you list here.
+    @@default_implicit_parts_order = [ "text/plain", "text/enriched", "text/html" ]
     cattr_accessor :default_implicit_parts_order
 
-    @@protected_instance_variables = []
+    @@protected_instance_variables = %w(@parts @mail)
     cattr_reader :protected_instance_variables
 
     # Specify the BCC addresses for the message
@@ -344,57 +342,17 @@ module ActionMailer #:nodoc:
     # have multiple mailer methods share the same template.
     adv_attr_accessor :template
 
-    # The mail and action_name instances referenced by this mailer.
-    attr_reader :mail, :action_name
-
-    # Where the response body is stored.
-    attr_internal :response_body
-
     # Override the mailer name, which defaults to an inflected version of the
     # mailer's class name. If you want to use a template in a non-standard
     # location, you can use this to specify that location.
-    attr_writer :mailer_name
+    adv_attr_accessor :mailer_name
 
-    def mailer_name(value = nil)
-      if value
-        @mailer_name = value
-      else
-        @mailer_name || self.class.mailer_name
-      end
-    end
+    # Expose the internal mail
+    attr_reader :mail
 
     # Alias controller_path to mailer_name so render :partial in views work.
     alias :controller_path :mailer_name
 
-    # Add a part to a multipart message, with the given content-type. The
-    # part itself is yielded to the block so that other properties (charset,
-    # body, headers, etc.) can be set on it.
-    def part(params)
-      params = {:content_type => params} if String === params
-      if custom_headers = params.delete(:headers)
-        ActiveSupport::Deprecation.warn('Passing custom headers with :headers => {} is deprecated. ' <<
-                                        'Please just pass in custom headers directly.', caller[0,10])
-        params.merge!(custom_headers)
-      end
-      part = Mail::Part.new(params)
-      yield part if block_given?
-      @parts << part
-    end
-
-    # Add an attachment to a multipart message. This is simply a part with the
-    # content-disposition set to "attachment".
-    def attachment(params, &block)
-      params = { :content_type => params } if String === params
-      params = { :content_disposition => "attachment",
-                 :content_transfer_encoding => "base64" }.merge(params)
-      if params[:body]
-        ActiveSupport::Deprecation.warn('attachment :body => "string" is deprecated. To set the body of an attachment ' <<
-                                        'please use :data instead, like attachment :data => "string".', caller[0,10])
-        params[:data] = params.delete(:body)
-      end
-      part(params, &block)
-    end
-
     class << self
       attr_writer :mailer_name
 
@@ -475,21 +433,47 @@ module ActionMailer #:nodoc:
     superclass_delegating_reader :delivery_method
     self.delivery_method = :smtp
 
+    # Add a part to a multipart message, with the given content-type. The
+    # part itself is yielded to the block so that other properties (charset,
+    # body, headers, etc.) can be set on it.
+    def part(params)
+      params = {:content_type => params} if String === params
+      if custom_headers = params.delete(:headers)
+        ActiveSupport::Deprecation.warn('Passing custom headers with :headers => {} is deprecated. ' <<
+                                        'Please just pass in custom headers directly.', caller[0,10])
+        params.merge!(custom_headers)
+      end
+      part = Mail::Part.new(params)
+      yield part if block_given?
+      @parts << part
+    end
+
+    # Add an attachment to a multipart message. This is simply a part with the
+    # content-disposition set to "attachment".
+    def attachment(params, &block)
+      super # Run deprecation hooks
+
+      params = { :content_type => params } if String === params
+      params = { :content_disposition => "attachment",
+                 :content_transfer_encoding => "base64" }.merge(params)
+
+      part(params, &block)
+    end
+
     # Instantiate a new mailer object. If +method_name+ is not +nil+, the mailer
     # will be initialized according to the named method. If not, the mailer will
     # remain uninitialized (useful when you only need to invoke the "receive"
     # method, for instance).
-    def initialize(method_name=nil, *parameters) #:nodoc:
-      @_response_body = nil
+    def initialize(method_name=nil, *args)
       super()
-      create!(method_name, *parameters) if method_name
+      process(method_name, *args) if method_name
     end
 
-    # Initialize the mailer via the given +method_name+. The body will be
+    # Process the mailer via the given +method_name+. The body will be
     # rendered and a new Mail object created.
-    def create!(method_name, *parameters) #:nodoc:
+    def process(method_name, *args)
       initialize_defaults(method_name)
-      __send__(method_name, *parameters)
+      super
 
       # Create e-mail parts
       create_parts
@@ -498,8 +482,8 @@ module ActionMailer #:nodoc:
       @subject ||= I18n.t(:subject, :scope => [:actionmailer, mailer_name, method_name],
                                     :default => method_name.humanize)
 
-      # build the mail object itself
-      @mail = create_mail
+      # Build the mail object itself
+      create_mail
     end
 
     # Delivers a Mail object. By default, it delivers the cached mail
@@ -513,7 +497,7 @@ module ActionMailer #:nodoc:
         logger.debug "\n#{mail.encoded}"
       end
 
-      ActiveSupport::Notifications.instrument(:deliver_mail, :mail => @mail) do
+      ActiveSupport::Notifications.instrument(:deliver_mail, :mail => mail) do
         begin
           self.delivery_method.perform_delivery(mail) if perform_deliveries
         rescue Exception => e # Net::SMTP errors or sendmail pipe errors
@@ -529,15 +513,14 @@ module ActionMailer #:nodoc:
       # Set up the default values for the various instance variables of this
       # mailer. Subclasses may override this method to provide different
       # defaults.
-      def initialize_defaults(method_name)
+      def initialize_defaults(method_name) #:nodoc:
         @charset              ||= @@default_charset.dup
         @content_type         ||= @@default_content_type.dup
         @implicit_parts_order ||= @@default_implicit_parts_order.dup
         @mime_version         ||= @@default_mime_version.dup if @@default_mime_version
 
-        @mailer_name ||= self.class.mailer_name
+        @mailer_name ||= self.class.mailer_name.dup
         @template    ||= method_name
-        @action_name = @template
 
         @parts   ||= []
         @headers ||= {}
@@ -546,29 +529,18 @@ module ActionMailer #:nodoc:
         super # Run deprecation hooks
       end
 
-      def create_parts
+      def create_parts #:nodoc:
         super # Run deprecation hooks
 
         if String === response_body
-          @parts.unshift Mail::Part.new(
-            :content_type => ["text", "plain", {:charset => charset}],
-            :content_disposition => "inline",
-            :body => response_body
-          )
+          @parts.unshift create_inline_part(response_body)
         else
-          self.class.template_root.find_all(@template, {}, mailer_name).each do |template|
-            ct = template.mime_type ? template.mime_type.to_s : "text/plain"
-            main_type, sub_type = ct.split("/")
-            @parts << Mail::Part.new(
-              :content_type => [main_type, sub_type, {:charset => charset}],
-              :content_disposition => "inline",
-              :body => render_to_body(:_template => template)
-            )
+          self.class.template_root.find_all(@template, {}, @mailer_name).each do |template|
+            @parts << create_inline_part(render_to_body(:_template => template), template.mime_type)
           end
 
           if @parts.size > 1
             @content_type = "multipart/alternative" if @content_type !~ /^multipart/
-            @parts = sort_parts(@parts, @implicit_parts_order)
           end
 
           # If this is a multipart e-mail add the mime_version if it is not
@@ -577,36 +549,18 @@ module ActionMailer #:nodoc:
         end
       end
 
-      def sort_parts(parts, order = [])
-        order = order.collect { |s| s.downcase }
-
-        parts = parts.sort do |a, b|
-          a_ct = a.content_type.string.downcase
-          b_ct = b.content_type.string.downcase
-
-          a_in = order.include? a_ct
-          b_in = order.include? b_ct
-
-          s = case
-          when a_in && b_in
-            order.index(a_ct) <=> order.index(b_ct)
-          when a_in
-            -1
-          when b_in
-            1
-          else
-            a_ct <=> b_ct
-          end
+      def create_inline_part(body, mime_type=nil) #:nodoc:
+        ct = mime_type || "text/plain"
+        main_type, sub_type = split_content_type(ct.to_s)
 
-          # reverse the ordering because parts that come last are displayed
-          # first in mail clients
-          (s * -1)
-        end
-
-        parts
+        Mail::Part.new(
+          :content_type => [main_type, sub_type, {:charset => charset}],
+          :content_disposition => "inline",
+          :body => body
+        )
       end
 
-      def create_mail
+      def create_mail #:nodoc:
         m = Mail.new
 
         m.subject,     = quote_any_if_necessary(charset, subject)
@@ -620,13 +574,9 @@ module ActionMailer #:nodoc:
         headers.each { |k, v| m[k] = v }
 
         real_content_type, ctype_attrs = parse_content_type
-        
-        if @parts.empty?
-          main_type, sub_type = split_content_type(real_content_type)
-          m.content_type([main_type, sub_type, ctype_attrs])
-          m.body = body
-        elsif @parts.size == 1 && @parts.first.parts.empty?
-          main_type, sub_type = split_content_type(real_content_type)
+        main_type, sub_type = split_content_type(real_content_type)
+
+        if @parts.size == 1 && @parts.first.parts.empty?
           m.content_type([main_type, sub_type, ctype_attrs])
           m.body = @parts.first.body.encoded
         else
@@ -634,31 +584,33 @@ module ActionMailer #:nodoc:
             m.add_part(p)
           end
 
+          m.body.set_sort_order(@implicit_parts_order)
+          m.body.sort_parts!
+
           if real_content_type =~ /multipart/
             ctype_attrs.delete "charset"
-            main_type, sub_type = split_content_type(real_content_type)
             m.content_type([main_type, sub_type, ctype_attrs])
           end
         end
 
+        m.content_transfer_encoding = '8bit' unless m.body.only_us_ascii?
+        
         @mail = m
       end
       
-      def split_content_type(ct)
+      def split_content_type(ct) #:nodoc:
         ct.to_s.split("/")
       end
 
-      def parse_content_type(defaults=nil)
-        if content_type.blank? 
-          return defaults                                                ? 
-            [ defaults.content_type, { 'charset' => defaults.charset } ] : 
-            [ nil, {} ] 
-        end 
-        ctype, *attrs = content_type.split(/;\s*/)
-        attrs = attrs.inject({}) { |h,s| k,v = s.split(/=/, 2); h[k] = v; h }
-        [ctype, {"charset" => charset || defaults && defaults.charset}.merge(attrs)]
+      def parse_content_type(defaults=nil) #:nodoc:
+        if @content_type.blank?
+          [ nil, {} ]
+        else
+          ctype, *attrs = @content_type.split(/;\s*/)
+          attrs = attrs.inject({}) { |h,s| k,v = s.split(/\=/, 2); h[k] = v; h }
+          [ctype, {"charset" => @charset}.merge(attrs)]
+        end
       end
 
-
   end
 end
diff --git a/actionmailer/lib/action_mailer/delivery_method.rb b/actionmailer/lib/action_mailer/delivery_method.rb
index 29a51afdc3..4f7d3afc3c 100644
--- a/actionmailer/lib/action_mailer/delivery_method.rb
+++ b/actionmailer/lib/action_mailer/delivery_method.rb
@@ -1,7 +1,7 @@
-require "active_support/core_ext/class"
+require 'active_support/core_ext/class'
+
 module ActionMailer
   module DeliveryMethod
-
     autoload :File,     'action_mailer/delivery_method/file'
     autoload :Sendmail, 'action_mailer/delivery_method/sendmail'
     autoload :Smtp,     'action_mailer/delivery_method/smtp'
@@ -52,6 +52,5 @@ module ActionMailer
       superclass_delegating_accessor :settings
       self.settings = {}
     end
-    
   end
 end
diff --git a/actionmailer/lib/action_mailer/delivery_method/file.rb b/actionmailer/lib/action_mailer/delivery_method/file.rb
index 99ef5bc76d..571e32df49 100644
--- a/actionmailer/lib/action_mailer/delivery_method/file.rb
+++ b/actionmailer/lib/action_mailer/delivery_method/file.rb
@@ -6,7 +6,7 @@ module ActionMailer
     # A delivery method implementation which writes all mails to a file.
     class File < Method
       self.settings = {
-        :location       => defined?(Rails) ? "#{Rails.root}/tmp/mails" : "#{Dir.tmpdir}/mails"
+        :location       => defined?(Rails.root) ? "#{Rails.root}/tmp/mails" : "#{Dir.tmpdir}/mails"
       }
 
       def perform_delivery(mail)
diff --git a/actionmailer/lib/action_mailer/delivery_method/smtp.rb b/actionmailer/lib/action_mailer/delivery_method/smtp.rb
index 9622dbb93a..af30c498b5 100644
--- a/actionmailer/lib/action_mailer/delivery_method/smtp.rb
+++ b/actionmailer/lib/action_mailer/delivery_method/smtp.rb
@@ -1,8 +1,9 @@
+require 'net/smtp'
+
 module ActionMailer
   module DeliveryMethod
     # A delivery method implementation which sends via smtp.
     class Smtp < Method
-
       self.settings = {
         :address              => "localhost",
         :port                 => 25,
@@ -25,6 +26,5 @@ module ActionMailer
         end
       end
     end
-
   end
 end
diff --git a/actionmailer/lib/action_mailer/deprecated_body.rb b/actionmailer/lib/action_mailer/deprecated_body.rb
index 50ff262432..20b0989a85 100644
--- a/actionmailer/lib/action_mailer/deprecated_body.rb
+++ b/actionmailer/lib/action_mailer/deprecated_body.rb
@@ -15,6 +15,14 @@ module ActionMailer
       @body ||= {}
     end
 
+    def attachment(params, &block)
+      if params[:body]
+        ActiveSupport::Deprecation.warn('attachment :body => "string" is deprecated. To set the body of an attachment ' <<
+                                        'please use :data instead, like attachment :data => "string".', caller[0,10])
+        params[:data] = params.delete(:body)
+      end
+    end
+
     def create_parts
       if String === @body
         ActiveSupport::Deprecation.warn('body is deprecated. To set the body with a text ' <<
diff --git a/actionmailer/lib/action_mailer/mail_helper.rb b/actionmailer/lib/action_mailer/mail_helper.rb
index 351b966abe..701dc34431 100644
--- a/actionmailer/lib/action_mailer/mail_helper.rb
+++ b/actionmailer/lib/action_mailer/mail_helper.rb
@@ -1,17 +1,24 @@
-module MailHelper
-  # Uses Text::Format to take the text and format it, indented two spaces for
-  # each line, and wrapped at 72 columns.
-  def block_format(text)
-    formatted = text.split(/\n\r\n/).collect { |paragraph| 
-      Text::Format.new(
-        :columns => 72, :first_indent => 2, :body_indent => 2, :text => paragraph
-      ).format
-    }.join("\n")
+module ActionMailer
+  module MailHelper
+    # Uses Text::Format to take the text and format it, indented two spaces for
+    # each line, and wrapped at 72 columns.
+    def block_format(text)
+      formatted = text.split(/\n\r\n/).collect { |paragraph|
+        Text::Format.new(
+          :columns => 72, :first_indent => 2, :body_indent => 2, :text => paragraph
+        ).format
+      }.join("\n")
     
-    # Make list points stand on their own line
-    formatted.gsub!(/[ ]*([*]+) ([^*]*)/) { |s| "  #{$1} #{$2.strip}\n" }
-    formatted.gsub!(/[ ]*([#]+) ([^#]*)/) { |s| "  #{$1} #{$2.strip}\n" }
+      # Make list points stand on their own line
+      formatted.gsub!(/[ ]*([*]+) ([^*]*)/) { |s| "  #{$1} #{$2.strip}\n" }
+      formatted.gsub!(/[ ]*([#]+) ([^#]*)/) { |s| "  #{$1} #{$2.strip}\n" }
+ 
+      formatted
+    end
 
-    formatted
+    # Access the mailer instance.
+    def mailer #:nodoc:
+      @controller
+    end
   end
 end
diff --git a/actionmailer/lib/action_mailer/rails.rb b/actionmailer/lib/action_mailer/rails.rb
new file mode 100644
index 0000000000..a3573cdea7
--- /dev/null
+++ b/actionmailer/lib/action_mailer/rails.rb
@@ -0,0 +1,24 @@
+require "action_mailer"
+
+module ActionMailer
+  class Plugin < Rails::Plugin
+    plugin_name :action_mailer
+
+    initializer "action_mailer.set_configs" do |app|
+      app.config.action_mailer.each do |k,v|
+        ActionMailer::Base.send "#{k}=", v
+      end
+    end
+
+    # TODO: ActionController::Base.logger should delegate to its own config.logger
+    initializer "action_mailer.logger" do
+      ActionMailer::Base.logger ||= Rails.logger
+    end
+
+    initializer "action_mailer.view_paths" do |app|
+      # TODO: this should be combined with the logic for default config.action_mailer.view_paths
+      view_path = ActionView::PathSet.type_cast(app.config.view_path, app.config.cache_classes)
+      ActionMailer::Base.template_root = view_path if ActionMailer::Base.view_paths.blank?
+    end
+  end
+end
\ No newline at end of file
diff --git a/actionmailer/lib/action_mailer/test_case.rb b/actionmailer/lib/action_mailer/test_case.rb
index 49f6d680a2..445abd0b89 100644
--- a/actionmailer/lib/action_mailer/test_case.rb
+++ b/actionmailer/lib/action_mailer/test_case.rb
@@ -1,4 +1,5 @@
 require 'active_support/test_case'
+require 'mail'
 
 module ActionMailer
   class NonInferrableMailerError < ::StandardError