1 files changed, 137 insertions, 57 deletions
diff --git a/actionmailer/test/base_test.rb b/actionmailer/test/base_test.rb
index 6116d1e29f..50f2c71737 100644
--- a/actionmailer/test/base_test.rb
+++ b/actionmailer/test/base_test.rb
@@ -1,4 +1,3 @@
-# encoding: utf-8
 require 'abstract_unit'
 require 'set'
 
@@ -10,7 +9,11 @@ require 'mailers/proc_mailer'
 require 'mailers/asset_mailer'
 
 class BaseTest < ActiveSupport::TestCase
+  include Rails::Dom::Testing::Assertions::DomAssertions
+
   setup do
+    @original_delivery_method = ActionMailer::Base.delivery_method
+    ActionMailer::Base.delivery_method = :test
     @original_asset_host = ActionMailer::Base.asset_host
     @original_assets_dir = ActionMailer::Base.assets_dir
   end
@@ -19,6 +22,7 @@ class BaseTest < ActiveSupport::TestCase
     ActionMailer::Base.asset_host = @original_asset_host
     ActionMailer::Base.assets_dir = @original_assets_dir
     BaseMailer.deliveries.clear
+    ActionMailer::Base.delivery_method = @original_delivery_method
   end
 
   test "method call to mail does not raise error" do
@@ -240,7 +244,7 @@ class BaseTest < ActiveSupport::TestCase
       end
     end
 
-    e = assert_raises(RuntimeError) { LateAttachmentMailer.welcome }
+    e = assert_raises(RuntimeError) { LateAttachmentMailer.welcome.message }
     assert_match(/Can't add attachments after `mail` was called./, e.message)
   end
 
@@ -252,10 +256,24 @@ class BaseTest < ActiveSupport::TestCase
       end
     end
 
-    e = assert_raises(RuntimeError) { LateInlineAttachmentMailer.welcome }
+    e = assert_raises(RuntimeError) { LateInlineAttachmentMailer.welcome.message }
     assert_match(/Can't add attachments after `mail` was called./, e.message)
   end
 
+  test "adding inline attachments while rendering mail works" do
+    class LateInlineAttachmentMailer < ActionMailer::Base
+      def on_render
+        mail from: "welcome@example.com", to: "to@example.com"
+      end
+    end
+
+    mail = LateInlineAttachmentMailer.on_render
+    assert_nothing_raised { mail.message }
+
+    assert_equal ["image/jpeg; filename=controller_attachments.jpg",
+                  "image/jpeg; filename=attachments.jpg"], mail.attachments.inline.map {|a| a['Content-Type'].to_s }
+  end
+
   test "accessing attachments works after mail was called" do
     class LateAttachmentAccessorMailer < ActionMailer::Base
       def welcome
@@ -268,7 +286,7 @@ class BaseTest < ActiveSupport::TestCase
       end
     end
 
-    assert_nothing_raised { LateAttachmentAccessorMailer.welcome }
+    assert_nothing_raised { LateAttachmentAccessorMailer.welcome.message }
   end
 
   # Implicit multipart
@@ -334,10 +352,35 @@ class BaseTest < ActiveSupport::TestCase
       assert_equal("text/plain", email.parts[0].mime_type)
       assert_equal("Implicit with locale PL TEXT", email.parts[0].body.encoded)
       assert_equal("text/html", email.parts[1].mime_type)
-      assert_equal("Implicit with locale HTML", email.parts[1].body.encoded)
+      assert_equal("Implicit with locale EN HTML", email.parts[1].body.encoded)
     end
   end
 
+  test "implicit multipart with fallback locale" do
+    fallback_backend = Class.new(I18n::Backend::Simple) do
+      include I18n::Backend::Fallbacks
+    end
+
+    begin
+      backend = I18n.backend
+      I18n.backend = fallback_backend.new
+      I18n.fallbacks[:"de-AT"] = [:de]
+
+      swap I18n, locale: 'de-AT' do
+        email = BaseMailer.implicit_with_locale
+        assert_equal(2, email.parts.size)
+        assert_equal("multipart/alternative", email.mime_type)
+        assert_equal("text/plain", email.parts[0].mime_type)
+        assert_equal("Implicit with locale DE-AT TEXT", email.parts[0].body.encoded)
+        assert_equal("text/html", email.parts[1].mime_type)
+        assert_equal("Implicit with locale DE HTML", email.parts[1].body.encoded)
+      end
+    ensure
+      I18n.backend = backend
+    end
+  end
+
+
   test "implicit multipart with several view paths uses the first one with template" do
     old = BaseMailer.view_paths
     begin
@@ -406,6 +449,13 @@ class BaseTest < ActiveSupport::TestCase
     assert_equal("Format with any!", email.parts[1].body.encoded)
   end
 
+  test 'explicit without specifying format with format.any' do
+    error = assert_raises(ArgumentError) do
+      BaseMailer.explicit_without_specifying_format_with_any.parts
+    end
+    assert_equal "You have to supply at least one format", error.message
+  end
+
   test "explicit multipart with format(Hash)" do
     email = BaseMailer.explicit_multipart_with_options(true)
     email.ready_to_send!
@@ -462,55 +512,57 @@ class BaseTest < ActiveSupport::TestCase
   end
 
   test "calling deliver on the action should deliver the mail object" do
-    BaseMailer.expects(:deliver_mail).once
-    mail = BaseMailer.welcome.deliver
-    assert_equal 'The first email on new API!', mail.subject
+    assert_called(BaseMailer, :deliver_mail) do
+      mail = BaseMailer.welcome.deliver_now
+      assert_equal 'The first email on new API!', mail.subject
+    end
   end
 
   test "calling deliver on the action should increment the deliveries collection if using the test mailer" do
-    BaseMailer.delivery_method = :test
-    BaseMailer.welcome.deliver
+    BaseMailer.welcome.deliver_now
     assert_equal(1, BaseMailer.deliveries.length)
   end
 
   test "calling deliver, ActionMailer should yield back to mail to let it call :do_delivery on itself" do
     mail = Mail::Message.new
-    mail.expects(:do_delivery).once
-    BaseMailer.expects(:welcome).returns(mail)
-    BaseMailer.welcome.deliver
+    assert_called(mail, :do_delivery) do
+      assert_called(BaseMailer, :welcome, returns: mail) do
+        BaseMailer.welcome.deliver
+      end
+    end
   end
 
   # Rendering
   test "you can specify a different template for implicit render" do
-    mail = BaseMailer.implicit_different_template('implicit_multipart').deliver
+    mail = BaseMailer.implicit_different_template('implicit_multipart').deliver_now
     assert_equal("HTML Implicit Multipart", mail.html_part.body.decoded)
     assert_equal("TEXT Implicit Multipart", mail.text_part.body.decoded)
   end
 
   test "should raise if missing template in implicit render" do
     assert_raises ActionView::MissingTemplate do
-      BaseMailer.implicit_different_template('missing_template').deliver
+      BaseMailer.implicit_different_template('missing_template').deliver_now
     end
     assert_equal(0, BaseMailer.deliveries.length)
   end
 
   test "you can specify a different template for explicit render" do
-    mail = BaseMailer.explicit_different_template('explicit_multipart_templates').deliver
+    mail = BaseMailer.explicit_different_template('explicit_multipart_templates').deliver_now
     assert_equal("HTML Explicit Multipart Templates", mail.html_part.body.decoded)
     assert_equal("TEXT Explicit Multipart Templates", mail.text_part.body.decoded)
   end
 
   test "you can specify a different layout" do
-    mail = BaseMailer.different_layout('different_layout').deliver
+    mail = BaseMailer.different_layout('different_layout').deliver_now
     assert_equal("HTML -- HTML", mail.html_part.body.decoded)
     assert_equal("PLAIN -- PLAIN", mail.text_part.body.decoded)
   end
 
   test "you can specify the template path for implicit lookup" do
-    mail = BaseMailer.welcome_from_another_path('another.path/base_mailer').deliver
+    mail = BaseMailer.welcome_from_another_path('another.path/base_mailer').deliver_now
     assert_equal("Welcome from another path", mail.body.encoded)
 
-    mail = BaseMailer.welcome_from_another_path(['unknown/invalid', 'another.path/base_mailer']).deliver
+    mail = BaseMailer.welcome_from_another_path(['unknown/invalid', 'another.path/base_mailer']).deliver_now
     assert_equal("Welcome from another path", mail.body.encoded)
   end
 
@@ -520,7 +572,7 @@ class BaseTest < ActiveSupport::TestCase
 
     mail = AssetMailer.welcome
 
-    assert_equal(%{<img alt="Dummy" src="http://global.com/images/dummy.png" />}, mail.body.to_s.strip)
+    assert_dom_equal(%{<img alt="Dummy" src="http://global.com/images/dummy.png" />}, mail.body.to_s.strip)
   end
 
   test "assets tags should use a Mailer's asset_host settings when available" do
@@ -534,19 +586,19 @@ class BaseTest < ActiveSupport::TestCase
 
     mail = TempAssetMailer.welcome
 
-    assert_equal(%{<img alt="Dummy" src="http://local.com/images/dummy.png" />}, mail.body.to_s.strip)
+    assert_dom_equal(%{<img alt="Dummy" src="http://local.com/images/dummy.png" />}, mail.body.to_s.strip)
   end
 
   test 'the view is not rendered when mail was never called' do
     mail = BaseMailer.without_mail_call
     assert_equal('', mail.body.to_s.strip)
-    mail.deliver
+    mail.deliver_now
   end
 
   test 'the return value of mailer methods is not relevant' do
     mail = BaseMailer.with_nil_as_return_value
     assert_equal('Welcome', mail.body.to_s.strip)
-    mail.deliver
+    mail.deliver_now
   end
 
   # Before and After hooks
@@ -565,8 +617,9 @@ class BaseTest < ActiveSupport::TestCase
     mail_side_effects do
       ActionMailer::Base.register_observer(MyObserver)
       mail = BaseMailer.welcome
-      MyObserver.expects(:delivered_email).with(mail)
-      mail.deliver
+      assert_called_with(MyObserver, :delivered_email, [mail]) do
+        mail.deliver_now
+      end
     end
   end
 
@@ -574,8 +627,9 @@ class BaseTest < ActiveSupport::TestCase
     mail_side_effects do
       ActionMailer::Base.register_observer("BaseTest::MyObserver")
       mail = BaseMailer.welcome
-      MyObserver.expects(:delivered_email).with(mail)
-      mail.deliver
+      assert_called_with(MyObserver, :delivered_email, [mail]) do
+        mail.deliver_now
+      end
     end
   end
 
@@ -583,8 +637,9 @@ class BaseTest < ActiveSupport::TestCase
     mail_side_effects do
       ActionMailer::Base.register_observer(:"base_test/my_observer")
       mail = BaseMailer.welcome
-      MyObserver.expects(:delivered_email).with(mail)
-      mail.deliver
+      assert_called_with(MyObserver, :delivered_email, [mail]) do
+        mail.deliver_now
+      end
     end
   end
 
@@ -592,9 +647,11 @@ class BaseTest < ActiveSupport::TestCase
     mail_side_effects do
       ActionMailer::Base.register_observers("BaseTest::MyObserver", MySecondObserver)
       mail = BaseMailer.welcome
-      MyObserver.expects(:delivered_email).with(mail)
-      MySecondObserver.expects(:delivered_email).with(mail)
-      mail.deliver
+      assert_called_with(MyObserver, :delivered_email, [mail]) do
+        assert_called_with(MySecondObserver, :delivered_email, [mail]) do
+          mail.deliver_now
+        end
+      end
     end
   end
 
@@ -612,8 +669,9 @@ class BaseTest < ActiveSupport::TestCase
     mail_side_effects do
       ActionMailer::Base.register_interceptor(MyInterceptor)
       mail = BaseMailer.welcome
-      MyInterceptor.expects(:delivering_email).with(mail)
-      mail.deliver
+      assert_called_with(MyInterceptor, :delivering_email, [mail]) do
+        mail.deliver_now
+      end
     end
   end
 
@@ -621,8 +679,9 @@ class BaseTest < ActiveSupport::TestCase
     mail_side_effects do
       ActionMailer::Base.register_interceptor("BaseTest::MyInterceptor")
       mail = BaseMailer.welcome
-      MyInterceptor.expects(:delivering_email).with(mail)
-      mail.deliver
+      assert_called_with(MyInterceptor, :delivering_email, [mail]) do
+        mail.deliver_now
+      end
     end
   end
 
@@ -630,8 +689,9 @@ class BaseTest < ActiveSupport::TestCase
     mail_side_effects do
       ActionMailer::Base.register_interceptor(:"base_test/my_interceptor")
       mail = BaseMailer.welcome
-      MyInterceptor.expects(:delivering_email).with(mail)
-      mail.deliver
+      assert_called_with(MyInterceptor, :delivering_email, [mail]) do
+        mail.deliver_now
+      end
     end
   end
 
@@ -639,18 +699,21 @@ class BaseTest < ActiveSupport::TestCase
     mail_side_effects do
       ActionMailer::Base.register_interceptors("BaseTest::MyInterceptor", MySecondInterceptor)
       mail = BaseMailer.welcome
-      MyInterceptor.expects(:delivering_email).with(mail)
-      MySecondInterceptor.expects(:delivering_email).with(mail)
-      mail.deliver
+      assert_called_with(MyInterceptor, :delivering_email, [mail]) do
+        assert_called_with(MySecondInterceptor, :delivering_email, [mail]) do
+          mail.deliver_now
+        end
+      end
     end
   end
 
   test "being able to put proc's into the defaults hash and they get evaluated on mail sending" do
     mail1 = ProcMailer.welcome['X-Proc-Method']
     yesterday = 1.day.ago
-    Time.stubs(:now).returns(yesterday)
-    mail2 = ProcMailer.welcome['X-Proc-Method']
-    assert(mail1.to_s.to_i > mail2.to_s.to_i)
+    Time.stub(:now, yesterday) do
+      mail2 = ProcMailer.welcome['X-Proc-Method']
+      assert(mail1.to_s.to_i > mail2.to_s.to_i)
+    end
   end
 
   test 'default values which have to_proc (e.g. symbols) should not be considered procs' do
@@ -835,33 +898,50 @@ class BasePreviewInterceptorsTest < ActiveSupport::TestCase
   test "you can register a preview interceptor to the mail object that gets passed the mail object before previewing" do
     ActionMailer::Base.register_preview_interceptor(MyInterceptor)
     mail = BaseMailer.welcome
-    BaseMailerPreview.any_instance.stubs(:welcome).returns(mail)
-    MyInterceptor.expects(:previewing_email).with(mail)
-    BaseMailerPreview.call(:welcome)
+    stub_any_instance(BaseMailerPreview) do |instance|
+      instance.stub(:welcome, mail) do
+        assert_called_with(MyInterceptor, :previewing_email, [mail]) do
+          BaseMailerPreview.call(:welcome)
+        end
+      end
+    end
   end
 
   test "you can register a preview interceptor using its stringified name to the mail object that gets passed the mail object before previewing" do
     ActionMailer::Base.register_preview_interceptor("BasePreviewInterceptorsTest::MyInterceptor")
     mail = BaseMailer.welcome
-    BaseMailerPreview.any_instance.stubs(:welcome).returns(mail)
-    MyInterceptor.expects(:previewing_email).with(mail)
-    BaseMailerPreview.call(:welcome)
+    stub_any_instance(BaseMailerPreview) do |instance|
+      instance.stub(:welcome, mail) do
+        assert_called_with(MyInterceptor, :previewing_email, [mail]) do
+          BaseMailerPreview.call(:welcome)
+        end
+      end
+    end
   end
 
   test "you can register an interceptor using its symbolized underscored name to the mail object that gets passed the mail object before previewing" do
     ActionMailer::Base.register_preview_interceptor(:"base_preview_interceptors_test/my_interceptor")
     mail = BaseMailer.welcome
-    BaseMailerPreview.any_instance.stubs(:welcome).returns(mail)
-    MyInterceptor.expects(:previewing_email).with(mail)
-    BaseMailerPreview.call(:welcome)
+    stub_any_instance(BaseMailerPreview) do |instance|
+      instance.stub(:welcome, mail) do
+        assert_called_with(MyInterceptor, :previewing_email, [mail]) do
+          BaseMailerPreview.call(:welcome)
+        end
+      end
+    end
   end
 
   test "you can register multiple preview interceptors to the mail object that both get passed the mail object before previewing" do
     ActionMailer::Base.register_preview_interceptors("BasePreviewInterceptorsTest::MyInterceptor", MySecondInterceptor)
     mail = BaseMailer.welcome
-    BaseMailerPreview.any_instance.stubs(:welcome).returns(mail)
-    MyInterceptor.expects(:previewing_email).with(mail)
-    MySecondInterceptor.expects(:previewing_email).with(mail)
-    BaseMailerPreview.call(:welcome)
+    stub_any_instance(BaseMailerPreview) do |instance|
+      instance.stub(:welcome, mail) do
+        assert_called_with(MyInterceptor, :previewing_email, [mail]) do
+          assert_called_with(MySecondInterceptor, :previewing_email, [mail]) do
+            BaseMailerPreview.call(:welcome)
+          end
+        end
+      end
+    end
   end
 end