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

4 files changed, 58 insertions, 50 deletions

diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb
index 7da033b6af..8c5c838384 100644
--- a/actionmailer/lib/action_mailer/base.rb
+++ b/actionmailer/lib/action_mailer/base.rb
@@ -60,21 +60,21 @@ module ActionMailer #:nodoc:
   #
   # If you want to explicitly render only certain templates, pass a block:
   #
-  #   mail(:to => user.emai) do |format|
+  #   mail(:to => user.email) do |format|
   #     format.text
   #     format.html
   #   end
   #
   # The block syntax is useful if also need to specify information specific to a part:
   #
-  #   mail(:to => user.emai) do |format|
+  #   mail(:to => user.email) do |format|
   #     format.text(:content_transfer_encoding => "base64")
   #     format.html
   #   end
   #
   # Or even to render a special view:
   #
-  #   mail(:to => user.emai) do |format|
+  #   mail(:to => user.email) do |format|
   #     format.text
   #     format.html { render "some_other_template" }
   #   end
@@ -657,7 +657,7 @@ module ActionMailer #:nodoc:
 
     def default_i18n_subject #:nodoc:
       mailer_scope = self.class.mailer_name.gsub('/', '.')
-      I18n.t(:subject, :scope => [:actionmailer, mailer_scope, action_name], :default => action_name.humanize)
+      I18n.t(:subject, :scope => [mailer_scope, action_name], :default => action_name.humanize)
     end
 
     def collect_responses_and_parts_order(headers) #:nodoc:
diff --git a/actionmailer/lib/action_mailer/test_case.rb b/actionmailer/lib/action_mailer/test_case.rb
index d4874c6dbf..b91eed592a 100644
--- a/actionmailer/lib/action_mailer/test_case.rb
+++ b/actionmailer/lib/action_mailer/test_case.rb
@@ -8,55 +8,69 @@ module ActionMailer
   end
 
   class TestCase < ActiveSupport::TestCase
-    include TestHelper
+    module Behavior
+      extend ActiveSupport::Concern
 
-    setup :initialize_test_deliveries
-    setup :set_expected_mail
+      include TestHelper
 
-    class << self
-      def tests(mailer)
-        write_inheritable_attribute(:mailer_class, mailer)
-      end
+      module ClassMethods
+        def tests(mailer)
+          write_inheritable_attribute(:mailer_class, mailer)
+        end
 
-      def mailer_class
-        if mailer = read_inheritable_attribute(:mailer_class)
-          mailer
-        else
-          tests determine_default_mailer(name)
+        def mailer_class
+          if mailer = read_inheritable_attribute(:mailer_class)
+            mailer
+          else
+            tests determine_default_mailer(name)
+          end
         end
-      end
 
-      def determine_default_mailer(name)
-        name.sub(/Test$/, '').constantize
-      rescue NameError => e
-        raise NonInferrableMailerError.new(name)
+        def determine_default_mailer(name)
+          name.sub(/Test$/, '').constantize
+        rescue NameError => e
+          raise NonInferrableMailerError.new(name)
+        end
       end
-    end
 
-    protected
-      def initialize_test_deliveries
-        ActionMailer::Base.delivery_method = :test
-        ActionMailer::Base.perform_deliveries = true
-        ActionMailer::Base.deliveries.clear
-      end
+      module InstanceMethods
 
-      def set_expected_mail
-        @expected = Mail.new
-        @expected.content_type ["text", "plain", { "charset" => charset }]
-        @expected.mime_version = '1.0'
-      end
+      protected
 
-    private
-      def charset
-        "UTF-8"
-      end
+        def initialize_test_deliveries
+          ActionMailer::Base.delivery_method = :test
+          ActionMailer::Base.perform_deliveries = true
+          ActionMailer::Base.deliveries.clear
+        end
+
+        def set_expected_mail
+          @expected = Mail.new
+          @expected.content_type ["text", "plain", { "charset" => charset }]
+          @expected.mime_version = '1.0'
+        end
+
+      private
+
+        def charset
+          "UTF-8"
+        end
+
+        def encode(subject)
+          Mail::Encodings.q_value_encode(subject, charset)
+        end
 
-      def encode(subject)
-        Mail::Encodings.q_value_encode(subject, charset)
+        def read_fixture(action)
+          IO.readlines(File.join(Rails.root, 'test', 'fixtures', self.class.mailer_class.name.underscore, action))
+        end
       end
 
-      def read_fixture(action)
-        IO.readlines(File.join(Rails.root, 'test', 'fixtures', self.class.mailer_class.name.underscore, action))
+      included do
+        setup :initialize_test_deliveries
+        setup :set_expected_mail
       end
+    end
+
+    include Behavior
+
   end
 end
diff --git a/actionmailer/lib/action_mailer/test_helper.rb b/actionmailer/lib/action_mailer/test_helper.rb
index 3a1612442f..5beab87ad2 100644
--- a/actionmailer/lib/action_mailer/test_helper.rb
+++ b/actionmailer/lib/action_mailer/test_helper.rb
@@ -1,5 +1,7 @@
 module ActionMailer
   module TestHelper
+    extend ActiveSupport::Concern
+
     # Asserts that the number of emails sent matches the given number.
     #
     #   def test_emails
@@ -57,11 +59,3 @@ module ActionMailer
     end
   end
 end
-
-module Test
-  module Unit
-    class TestCase
-      include ActionMailer::TestHelper
-    end
-  end
-end
diff --git a/actionmailer/lib/rails/generators/mailer/templates/mailer.rb b/actionmailer/lib/rails/generators/mailer/templates/mailer.rb
index 7343eb28b3..21e5918ecb 100644
--- a/actionmailer/lib/rails/generators/mailer/templates/mailer.rb
+++ b/actionmailer/lib/rails/generators/mailer/templates/mailer.rb
@@ -5,7 +5,7 @@ class <%= class_name %> < ActionMailer::Base
   # Subject can be set in your I18n file at config/locales/en.yml
   # with the following lookup:
   #
-  #   en.actionmailer.<%= file_name %>.<%= action %>.subject
+  #   en.<%= file_name %>.<%= action %>.subject
   #
   def <%= action %>
     @greeting = "Hi"