mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
Add some tests to collector with templates and any.
This commit is contained in:
parent
6ba944608e
commit
c985a0ee3d
5 changed files with 50 additions and 14 deletions
|
@ -2,6 +2,7 @@ require 'active_support/core_ext/class'
|
|||
require 'active_support/core_ext/module/delegation'
|
||||
require 'mail'
|
||||
require 'action_mailer/tmail_compat'
|
||||
require 'action_mailer/collector'
|
||||
|
||||
module ActionMailer #:nodoc:
|
||||
# Action Mailer allows you to send email from your application using a mailer model and views.
|
||||
|
@ -442,7 +443,6 @@ module ActionMailer #:nodoc:
|
|||
end
|
||||
|
||||
content_type ||= create_parts_from_responses(m, responses, charset)
|
||||
|
||||
m.content_type = content_type
|
||||
m.charset = charset
|
||||
m.mime_version = mime_version
|
||||
|
|
|
@ -14,11 +14,10 @@ module ActionMailer #:nodoc:
|
|||
@default_formats = context.formats
|
||||
end
|
||||
|
||||
# TODO Test me
|
||||
def any(*args, &block)
|
||||
options = args.extract_options!
|
||||
raise "You have to supply at least one format" if args.empty?
|
||||
args.each { |type| send(type, options, &block) }
|
||||
args.each { |type| send(type, options.dup, &block) }
|
||||
end
|
||||
alias :all :any
|
||||
|
||||
|
|
|
@ -78,6 +78,18 @@ class BaseTest < ActiveSupport::TestCase
|
|||
end
|
||||
end
|
||||
|
||||
def explicit_multipart_templates(hash = {})
|
||||
mail(DEFAULT_HEADERS.merge(hash)) do |format|
|
||||
format.html
|
||||
format.text
|
||||
end
|
||||
end
|
||||
|
||||
def explicit_multipart_with_any(hash = {})
|
||||
mail(DEFAULT_HEADERS.merge(hash)) do |format|
|
||||
format.any(:text, :html){ render :text => "Format with any!" }
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
test "method call to mail does not raise error" do
|
||||
|
@ -214,7 +226,7 @@ class BaseTest < ActiveSupport::TestCase
|
|||
end
|
||||
|
||||
# Implicit multipart
|
||||
test "implicit multipart tests" do
|
||||
test "implicit multipart" do
|
||||
email = BaseMailer.deliver_implicit_multipart
|
||||
assert_equal(2, email.parts.size)
|
||||
assert_equal("multipart/alternate", email.mime_type)
|
||||
|
@ -224,7 +236,7 @@ class BaseTest < ActiveSupport::TestCase
|
|||
assert_equal("HTML Implicit Multipart", email.parts[1].body.encoded)
|
||||
end
|
||||
|
||||
test "implicit multipart tests with sort order" do
|
||||
test "implicit multipart with sort order" do
|
||||
order = ["text/html", "text/plain"]
|
||||
swap BaseMailer, :default_implicit_parts_order => order do
|
||||
email = BaseMailer.deliver_implicit_multipart
|
||||
|
@ -258,7 +270,8 @@ class BaseTest < ActiveSupport::TestCase
|
|||
end
|
||||
end
|
||||
|
||||
test "explicit multipart tests" do
|
||||
# Explicit multipart
|
||||
test "explicit multipart" do
|
||||
email = BaseMailer.deliver_explicit_multipart
|
||||
assert_equal(2, email.parts.size)
|
||||
assert_equal("multipart/alternate", email.mime_type)
|
||||
|
@ -291,6 +304,28 @@ class BaseTest < ActiveSupport::TestCase
|
|||
assert_equal("HTML Explicit Multipart", email.parts[1].parts[1].body.encoded)
|
||||
end
|
||||
|
||||
# TODO Seems Mail is sorting the templates automatically, and not on demand
|
||||
# test "explicit multipart with templates" do
|
||||
# email = BaseMailer.deliver_explicit_multipart_templates
|
||||
# assert_equal(2, email.parts.size)
|
||||
# assert_equal("multipart/alternate", email.mime_type)
|
||||
# assert_equal("text/html", email.parts[0].mime_type)
|
||||
# assert_equal("HTML Explicit Multipart Templates", email.parts[0].body.encoded)
|
||||
# assert_equal("text/plain", email.parts[1].mime_type)
|
||||
# assert_equal("TEXT Explicit Multipart Templates", email.parts[1].body.encoded)
|
||||
# end
|
||||
|
||||
test "explicit multipart with any" do
|
||||
email = BaseMailer.deliver_explicit_multipart_with_any
|
||||
assert_equal(2, email.parts.size)
|
||||
assert_equal("multipart/alternate", email.mime_type)
|
||||
assert_equal("text/plain", email.parts[0].mime_type)
|
||||
assert_equal("Format with any!", email.parts[0].body.encoded)
|
||||
assert_equal("text/html", email.parts[1].mime_type)
|
||||
assert_equal("Format with any!", email.parts[1].body.encoded)
|
||||
end
|
||||
|
||||
|
||||
protected
|
||||
|
||||
# Execute the block setting the given values and restoring old values after
|
||||
|
|
1
actionmailer/test/fixtures/base_mailer/explicit_multipart_templates.html.erb
vendored
Normal file
1
actionmailer/test/fixtures/base_mailer/explicit_multipart_templates.html.erb
vendored
Normal file
|
@ -0,0 +1 @@
|
|||
HTML Explicit Multipart Templates
|
1
actionmailer/test/fixtures/base_mailer/explicit_multipart_templates.text.erb
vendored
Normal file
1
actionmailer/test/fixtures/base_mailer/explicit_multipart_templates.text.erb
vendored
Normal file
|
@ -0,0 +1 @@
|
|||
TEXT Explicit Multipart Templates
|
Loading…
Reference in a new issue