RubyGems - actionmailer - Versions diffs - 1.3.6 → 2.0.0 - Mend

actionmailer 1.3.6 → 2.0.0

Potentially problematic release.

This version of actionmailer might be problematic. Click here for more details.

Files changed (96) hide show

data/test/fixtures/second_mailer/share.erb ADDED

	@@ -0,0 +1 @@
1	+ second mail

data/test/fixtures/second_mailer/share.rhtml CHANGED

	@@ -1 +0,0 @@
1	- second mail

data/test/fixtures/templates/signed_up.erb ADDED

@@ -0,0 +1,3 @@
+Hello there,
+Mr. <%= @recipient %>

data/test/fixtures/templates/signed_up.rhtml CHANGED

@@ -1,3 +0,0 @@
-Hello there,
-Mr. <%= @recipient %>

data/test/fixtures/test_mailer/_subtemplate.text.plain.erb ADDED

	@@ -0,0 +1 @@
1	+ let's go!

data/test/fixtures/test_mailer/custom_templating_extension.text.html.haml ADDED

@@ -0,0 +1,6 @@
+%p Hello there,
+%p
+  Mr.
+  = @recipient
+  from haml

data/test/fixtures/test_mailer/custom_templating_extension.text.plain.haml ADDED

@@ -0,0 +1,6 @@
+%p Hello there,
+%p
+  Mr.
+  = @recipient
+  from haml

data/test/fixtures/test_mailer/implicitly_multipart_example.ignored.erb ADDED

	@@ -0,0 +1 @@
1	+ Ignored when searching for implicitly multipart parts.

data/test/fixtures/test_mailer/implicitly_multipart_example.ignored.rhtml CHANGED

	@@ -1 +0,0 @@
1	- Ignored when searching for implicitly multipart parts.

data/test/fixtures/test_mailer/implicitly_multipart_example.text.html.erb ADDED

@@ -0,0 +1,10 @@
+<html>
+  <body>
+    HTML formatted message to <strong><%= @recipient %></strong>.
+  </body>
+</html>
+<html>
+  <body>
+    HTML formatted message to <strong><%= @recipient %></strong>.
+  </body>
+</html>

data/test/fixtures/test_mailer/implicitly_multipart_example.text.html.rhtml CHANGED

@@ -1,10 +0,0 @@
-<html>
-  <body>
-    HTML formatted message to <strong><%= @recipient %></strong>.
-  </body>
-</html>
-<html>
-  <body>
-    HTML formatted message to <strong><%= @recipient %></strong>.
-  </body>
-</html>

data/test/fixtures/test_mailer/implicitly_multipart_example.text.plain.erb ADDED

	@@ -0,0 +1,2 @@
1	+ Plain text to <%= @recipient %>.
2	+ Plain text to <%= @recipient %>.

data/test/fixtures/test_mailer/implicitly_multipart_example.text.plain.rhtml CHANGED

	@@ -1,2 +0,0 @@
1	- Plain text to <%= @recipient %>.
2	- Plain text to <%= @recipient %>.

data/test/fixtures/test_mailer/implicitly_multipart_example.text.yaml.erb ADDED

	@@ -0,0 +1 @@
1	+ yaml to: <%= @recipient %>

data/test/fixtures/test_mailer/implicitly_multipart_example.text.yaml.rhtml CHANGED

	@@ -1 +0,0 @@
1	- yaml to: <%= @recipient %>

data/test/fixtures/test_mailer/included_subtemplate.text.plain.erb ADDED

	@@ -0,0 +1 @@
1	+ Hey Ho, <%= render :partial => "subtemplate" %>

data/test/fixtures/test_mailer/rxml_template.builder ADDED

	@@ -0,0 +1,2 @@
1	+ xml.instruct!
2	+ xml.test

data/test/fixtures/test_mailer/rxml_template.rxml ADDED

	@@ -0,0 +1,2 @@
1	+ xml.instruct!
2	+ xml.test

data/test/fixtures/test_mailer/signed_up.erb ADDED

@@ -0,0 +1,3 @@
+Hello there,
+Mr. <%= @recipient %>

data/test/fixtures/test_mailer/signed_up.rhtml CHANGED

@@ -1,3 +0,0 @@
-Hello there,
-Mr. <%= @recipient %>

data/test/fixtures/test_mailer/signed_up_with_url.erb ADDED

@@ -0,0 +1,5 @@
+Hello there,
+Mr. <%= @recipient %>. Please see our greeting at <%= @welcome_url %> <%= welcome_url %>
+<%= image_tag "somelogo.png" %>

data/test/fixtures/test_mailer/signed_up_with_url.rhtml CHANGED

@@ -1,3 +0,0 @@
-Hello there,
-Mr. <%= @recipient %>. Please see our greeting at <%= @welcome_url %>

data/test/mail_helper_test.rb CHANGED

@@ -8,7 +8,7 @@ end
 class HelperMailer < ActionMailer::Base
   helper MailerHelper
-  helper :test
+  helper :example
   def use_helper(recipient)
     recipients recipient
@@ -16,7 +16,7 @@ class HelperMailer < ActionMailer::Base
     from       "tester@example.com"
   end
-  def use_test_helper(recipient)
+  def use_example_helper(recipient)
     recipients recipient
     subject    "using helpers"
     from       "tester@example.com"
@@ -60,20 +60,24 @@ class MailerHelperTest < Test::Unit::TestCase
   end
   def setup
-    ActionMailer::Base.delivery_method = :test
+    set_delivery_method :test
     ActionMailer::Base.perform_deliveries = true
     ActionMailer::Base.deliveries = []
     @recipient = 'test@localhost'
   end
+  def teardown
+    restore_delivery_method
+  end
   def test_use_helper
     mail = HelperMailer.create_use_helper(@recipient)
     assert_match %r{Mr. Joe Person}, mail.encoded
   end
-  def test_use_test_helper
-    mail = HelperMailer.create_use_test_helper(@recipient)
+  def test_use_example_helper
+    mail = HelperMailer.create_use_example_helper(@recipient)
     assert_match %r{<em><strong><small>emphasize me!}, mail.encoded
   end

data/test/mail_render_test.rb CHANGED

@@ -15,6 +15,25 @@ class RenderMailer < ActionMailer::Base
     body       render(:file => "signed_up", :body => { :recipient => recipient })
   end
+  def rxml_template(recipient)
+    recipients recipient
+    subject    "rendering rxml template"
+    from       "tester@example.com"
+  end
+  def included_subtemplate(recipient)
+    recipients recipient
+    subject    "Including another template in the one being rendered"
+    from       "tester@example.com"
+  end
+  def included_old_subtemplate(recipient)
+    recipients recipient
+    subject    "Including another template in the one being rendered"
+    from       "tester@example.com"
+    body       render(:inline => "Hello, <%= render \"subtemplate\" %>", :body => { :world => "Earth" })
+  end
   def initialize_defaults(method_name)
     super
     mailer_name "test_mailer"
@@ -39,13 +58,17 @@ end
 class RenderHelperTest < Test::Unit::TestCase
   def setup
-    ActionMailer::Base.delivery_method = :test
+    set_delivery_method :test
     ActionMailer::Base.perform_deliveries = true
     ActionMailer::Base.deliveries = []
     @recipient = 'test@localhost'
   end
+  def teardown
+    restore_delivery_method
+  end
   def test_inline_template
     mail = RenderMailer.create_inline_template(@recipient)
     assert_equal "Hello, Earth", mail.body.strip
@@ -55,17 +78,37 @@ class RenderHelperTest < Test::Unit::TestCase
     mail = RenderMailer.create_file_template(@recipient)
     assert_equal "Hello there, \n\nMr. test@localhost", mail.body.strip
   end
+  def test_rxml_template
+    mail = RenderMailer.deliver_rxml_template(@recipient)
+    assert_equal "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<test/>", mail.body.strip
+  end
+  def test_included_subtemplate
+    mail = RenderMailer.deliver_included_subtemplate(@recipient)
+    assert_equal "Hey Ho, let's go!", mail.body.strip
+  end
+  def test_deprecated_old_subtemplate
+    assert_raises ActionView::ActionViewError do
+      RenderMailer.deliver_included_old_subtemplate(@recipient)
+    end
+  end
 end
 class FirstSecondHelperTest < Test::Unit::TestCase
   def setup
-    ActionMailer::Base.delivery_method = :test
+    set_delivery_method :test
     ActionMailer::Base.perform_deliveries = true
     ActionMailer::Base.deliveries = []
     @recipient = 'test@localhost'
   end
+  def teardown
+    restore_delivery_method
+  end
   def test_ordering
     mail = FirstMailer.create_share(@recipient)
     assert_equal "first mail", mail.body.strip

data/test/mail_service_test.rb CHANGED

@@ -172,6 +172,15 @@ class TestMailer < ActionMailer::Base
     body["recipient"] = recipient
   end
+  def custom_templating_extension(recipient)
+    recipients recipient
+    subject    "[Signed up] Welcome #{recipient}"
+    from       "system@loudthinking.com"
+    sent_on    Time.local(2004, 12, 12)
+    body["recipient"] = recipient
+  end
   def various_newlines(recipient)
     recipients   recipient
     subject      "various newlines"
@@ -201,6 +210,16 @@ class TestMailer < ActionMailer::Base
     attachment :content_type => "application/octet-stream",:filename => "test.txt", :body => "test abcdefghijklmnopqstuvwxyz"
   end
+  def nested_multipart_with_body(recipient)
+    recipients   recipient
+    subject      "nested multipart with body"
+    from         "test@example.com"
+    content_type "multipart/mixed"
+    part :content_type => "multipart/alternative", :content_disposition => "inline", :body => "Nothing to see here." do |p|
+      p.part :content_type => "text/html", :body => "<b>test</b> HTML<br/>"
+    end
+  end
   def attachment_with_custom_header(recipient)
     recipients   recipient
     subject      "custom header in attachment"
@@ -236,6 +255,14 @@ class TestMailer < ActionMailer::Base
     body         "testing"
   end
+  def return_path
+    recipients   "no.one@nowhere.test"
+    subject      "return path test"
+    from         "some.one@somewhere.test"
+    body         "testing"
+    headers      "return-path" => "another@somewhere.test"
+  end
   class <<self
     attr_accessor :received_body
   end
@@ -245,6 +272,8 @@ class TestMailer < ActionMailer::Base
   end
 end
+uses_mocha 'ActionMailerTest' do
 class ActionMailerTest < Test::Unit::TestCase
   include ActionMailer::Quoting
@@ -261,14 +290,22 @@ class ActionMailerTest < Test::Unit::TestCase
     mail
   end
+  # Replacing logger work around for mocha bug. Should be fixed in mocha 0.3.3
   def setup
-    ActionMailer::Base.delivery_method = :test
+    set_delivery_method :test
     ActionMailer::Base.perform_deliveries = true
+    ActionMailer::Base.raise_delivery_errors = true
     ActionMailer::Base.deliveries = []
+    @original_logger = TestMailer.logger
     @recipient = 'test@localhost'
   end
+  def teardown
+    TestMailer.logger = @original_logger
+    restore_delivery_method
+  end
   def test_nested_parts
     created = nil
     assert_nothing_raised { created = TestMailer.create_nested_multipart(@recipient)}
@@ -283,6 +320,19 @@ class ActionMailerTest < Test::Unit::TestCase
     assert_equal "application/octet-stream", created.parts[1].content_type
   end
+  def test_nested_parts_with_body
+    created = nil
+    assert_nothing_raised { created = TestMailer.create_nested_multipart_with_body(@recipient)}
+    assert_equal 1,created.parts.size
+    assert_equal 2,created.parts.first.parts.size
+    assert_equal "multipart/mixed", created.content_type
+    assert_equal "multipart/alternative", created.parts.first.content_type
+    assert_equal "Nothing to see here.", created.parts.first.parts.first.body
+    assert_equal "text/plain", created.parts.first.parts.first.content_type
+    assert_equal "text/html", created.parts.first.parts[1].content_type
+  end
   def test_attachment_with_custom_header
     created = nil
     assert_nothing_raised { created = TestMailer.create_attachment_with_custom_header(@recipient)}
@@ -320,7 +370,37 @@ class ActionMailerTest < Test::Unit::TestCase
     assert_not_nil created
     assert_equal expected.encoded, created.encoded
   end
+  def test_custom_templating_extension
+    #
+    # N.b., custom_templating_extension.text.plain.haml is expected to be in fixtures/test_mailer directory
+    expected = new_mail
+    expected.to      = @recipient
+    expected.subject = "[Signed up] Welcome #{@recipient}"
+    expected.body    = "Hello there, \n\nMr. #{@recipient}"
+    expected.from    = "system@loudthinking.com"
+    expected.date    = Time.local(2004, 12, 12)
+    # Stub the render method so no alternative renderers need be present.
+    ActionView::Base.any_instance.stubs(:render).returns("Hello there, \n\nMr. #{@recipient}")
+    # If the template is not registered, there should be no parts.
+    created = nil
+    assert_nothing_raised { created = TestMailer.create_custom_templating_extension(@recipient) }
+    assert_not_nil created
+    assert_equal 0, created.parts.length
+    ActionMailer::Base.register_template_extension('haml')
+    # Now that the template is registered, there should be one part. The text/plain part.
+    created = nil
+    assert_nothing_raised { created = TestMailer.create_custom_templating_extension(@recipient) }
+    assert_not_nil created
+    assert_equal 2, created.parts.length
+    assert_equal 'text/plain', created.parts[0].content_type
+    assert_equal 'text/html', created.parts[1].content_type
+  end
   def test_cancelled_account
     expected = new_mail
     expected.to      = @recipient
@@ -435,6 +515,29 @@ class ActionMailerTest < Test::Unit::TestCase
     TestMailer.deliver_signed_up(@recipient)
     assert_equal 1, ActionMailer::Base.deliveries.size
   end
+  def test_doesnt_raise_errors_when_raise_delivery_errors_is_false
+    ActionMailer::Base.raise_delivery_errors = false
+    TestMailer.any_instance.expects(:perform_delivery_test).raises(Exception)
+    assert_nothing_raised { TestMailer.deliver_signed_up(@recipient) }
+  end
+  def test_performs_delivery_via_sendmail
+    sm = mock()
+    sm.expects(:print).with(anything)
+    sm.expects(:flush)
+    IO.expects(:popen).once.with('/usr/sbin/sendmail -i -t', 'w+').yields(sm)
+    ActionMailer::Base.delivery_method = :sendmail
+    TestMailer.deliver_signed_up(@recipient)
+  end
+  def test_delivery_logs_sent_mail
+    mail = TestMailer.create_signed_up(@recipient)
+    logger = mock()
+    logger.expects(:info).with("Sent mail:\n #{mail.encoded}")
+    TestMailer.logger = logger
+    TestMailer.deliver_signed_up(@recipient)
+  end
   def test_unquote_quoted_printable_subject
     msg = <<EOF
@@ -663,23 +766,23 @@ EOF
   def test_implicitly_multipart_messages
     mail = TestMailer.create_implicitly_multipart_example(@recipient)
-    assert_equal 3, mail.parts.length
+    assert_equal 6, mail.parts.length
     assert_equal "1.0", mail.mime_version
     assert_equal "multipart/alternative", mail.content_type
     assert_equal "text/yaml", mail.parts[0].content_type
     assert_equal "utf-8", mail.parts[0].sub_header("content-type", "charset")
-    assert_equal "text/plain", mail.parts[1].content_type
-    assert_equal "utf-8", mail.parts[1].sub_header("content-type", "charset")
-    assert_equal "text/html", mail.parts[2].content_type
+    assert_equal "text/plain", mail.parts[2].content_type
     assert_equal "utf-8", mail.parts[2].sub_header("content-type", "charset")
+    assert_equal "text/html", mail.parts[4].content_type
+    assert_equal "utf-8", mail.parts[4].sub_header("content-type", "charset")
   end
   def test_implicitly_multipart_messages_with_custom_order
     mail = TestMailer.create_implicitly_multipart_example(@recipient, nil, ["text/yaml", "text/plain"])
-    assert_equal 3, mail.parts.length
+    assert_equal 6, mail.parts.length
     assert_equal "text/html", mail.parts[0].content_type
-    assert_equal "text/plain", mail.parts[1].content_type
-    assert_equal "text/yaml", mail.parts[2].content_type
+    assert_equal "text/plain", mail.parts[2].content_type
+    assert_equal "text/yaml", mail.parts[4].content_type
   end
   def test_implicitly_multipart_messages_with_charset
@@ -749,12 +852,6 @@ EOF
     assert_nothing_raised { mail.body }
   end
-  def test_decode_message_with_unquoted_atchar_in_header
-    fixture = File.read(File.dirname(__FILE__) + "/fixtures/raw_email11")
-    mail = TMail::Mail.parse(fixture)
-    assert_not_nil mail.from
-  end
   def test_empty_header_values_omitted
     result = TestMailer.create_unnamed_attachment(@recipient).encoded
     assert_match %r{Content-Type: application/octet-stream[^;]}, result
@@ -787,21 +884,21 @@ EOF
     assert_match %r{format=flowed}, mail['content-type'].to_s
     assert_match %r{charset=utf-8}, mail['content-type'].to_s
   end
-  def test_deprecated_server_settings
-    old_smtp_settings = ActionMailer::Base.smtp_settings
-    assert_deprecated do
-      ActionMailer::Base.server_settings
-    end
-    assert_deprecated do
-      ActionMailer::Base.server_settings={}
-      assert_equal Hash.new, ActionMailer::Base.smtp_settings
-    end
-  ensure
-    ActionMailer::Base.smtp_settings=old_smtp_settings
+  def test_return_path_with_create
+    mail = TestMailer.create_return_path
+    assert_equal "<another@somewhere.test>", mail['return-path'].to_s
+  end
+  def test_return_path_with_deliver
+    ActionMailer::Base.delivery_method = :smtp
+    TestMailer.deliver_return_path
+    assert_match %r{^Return-Path: <another@somewhere.test>}, MockSMTP.deliveries[0][0]
   end
 end
+end # uses_mocha
 class InheritableTemplateRootTest < Test::Unit::TestCase
   def test_attr
     expected = "#{File.dirname(__FILE__)}/fixtures/path.with.dots"
@@ -814,3 +911,29 @@ class InheritableTemplateRootTest < Test::Unit::TestCase
     assert_equal expected, FunkyPathMailer.template_root
   end
 end
+class MethodNamingTest < Test::Unit::TestCase
+  class TestMailer < ActionMailer::Base
+    def send
+      body 'foo'
+    end
+  end
+  def setup
+    set_delivery_method :test
+    ActionMailer::Base.perform_deliveries = true
+    ActionMailer::Base.deliveries = []
+  end
+  def teardown
+    restore_delivery_method
+  end
+  def test_send_method
+    assert_nothing_raised do
+      assert_emails 1 do
+        TestMailer.deliver_send
+      end
+    end
+  end
+end