Merge remote branch 'mainstream/master'

Conflicts:
	activerecord/lib/active_record/base.rb
	railties/lib/rails/configuration.rb
	railties/lib/rails/log_subscriber.rb

1 files changed, 48 insertions, 0 deletions

diff --git a/actionmailer/test/log_subscriber_test.rb b/actionmailer/test/log_subscriber_test.rb
new file mode 100644
index 0000000000..c08c34b4a2
--- /dev/null
+++ b/actionmailer/test/log_subscriber_test.rb
@@ -0,0 +1,48 @@
+require "abstract_unit"
+require "rails/log_subscriber/test_helper"
+require "action_mailer/railties/log_subscriber"
+
+class AMLogSubscriberTest < ActionMailer::TestCase
+  include Rails::LogSubscriber::TestHelper
+
+  def setup
+    super
+    Rails::LogSubscriber.add(:action_mailer, ActionMailer::Railties::LogSubscriber.new)
+  end
+
+  class TestMailer < ActionMailer::Base
+    def basic
+      recipients "somewhere@example.com"
+      subject    "basic"
+      from       "basic@example.com"
+      body       "Hello world"
+    end
+
+    def receive(mail)
+      # Do nothing
+    end
+  end
+
+  def set_logger(logger)
+    ActionMailer::Base.logger = logger
+  end
+
+  def test_deliver_is_notified
+    TestMailer.basic.deliver
+    wait
+    assert_equal(1, @logger.logged(:info).size)
+    assert_match(/Sent mail to somewhere@example.com/, @logger.logged(:info).first)
+    assert_equal(1, @logger.logged(:debug).size)
+    assert_match(/Hello world/, @logger.logged(:debug).first)
+  end
+
+  def test_receive_is_notified
+    fixture = File.read(File.dirname(__FILE__) + "/fixtures/raw_email")
+    TestMailer.receive(fixture)
+    wait
+    assert_equal(1, @logger.logged(:info).size)
+    assert_match(/Received mail/, @logger.logged(:info).first)
+    assert_equal(1, @logger.logged(:debug).size)
+    assert_match(/Jamis/, @logger.logged(:debug).first)
+  end
+end
\ No newline at end of file