Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Resolve conflict among mailer actions with the same name. Closes #5520.

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4509 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
commit 1fd9a46d713a4b314621bd7cf171bd048b10741f 1 parent 5b866f7
@jeremy jeremy authored
View
2  actionmailer/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Resolve conflict among mailer actions with the same name. #5520 [ssinghi@kreeti.com]
+
* ActionMailer::Base documentation rewrite. Closes #4991 [Kevin Clark, Marcel Molina Jr.]
* Replace alias method chaining with Module#alias_method_chain. [Marcel Molina Jr.]
View
6 actionmailer/lib/action_mailer/base.rb
@@ -353,7 +353,7 @@ def create!(method_name, *parameters) #:nodoc:
content_type = md.captures[1].gsub('.', '/')
@parts << Part.new(:content_type => content_type,
:disposition => "inline", :charset => charset,
- :body => render_message(template_name, @body))
+ :body => render_message("#{mailer_name}/#{template_name}", @body))
end
unless @parts.empty?
@content_type = "multipart/alternative"
@@ -367,7 +367,7 @@ def create!(method_name, *parameters) #:nodoc:
# it.
template_exists = @parts.empty?
template_exists ||= Dir.glob("#{template_path}/#{@template}.*").any? { |i| File.basename(i).split(".").length == 2 }
- @body = render_message(@template, @body) if template_exists
+ @body = render_message("#{mailer_name}/#{@template}", @body) if template_exists
# Finally, if there are other message parts and a textual body exists,
# we shift it onto the front of the parts and set the body to nil (so
@@ -432,7 +432,7 @@ def template_path
end
def initialize_template_class(assigns)
- ActionView::Base.new(template_path, assigns, self)
+ ActionView::Base.new(template_root, assigns, self)
end
def sort_parts(parts, order = [])
View
1  actionmailer/test/fixtures/first_mailer/share.rhtml
@@ -0,0 +1 @@
+first mail
View
1  actionmailer/test/fixtures/path.with.dots/funky_path_mailer/multipart_with_template_path_with_dots.rhtml
@@ -0,0 +1 @@
+Have a lovely picture, from me. Enjoy!
View
1  actionmailer/test/fixtures/path.with.dots/multipart_with_template_path_with_dots.rhtml
@@ -1 +0,0 @@
-Have a lovely picture, from me. Enjoy!
View
1  actionmailer/test/fixtures/second_mailer/share.rhtml
@@ -0,0 +1 @@
+second mail
View
38 actionmailer/test/mail_render_test.rb
@@ -15,7 +15,7 @@ def file_template(recipient)
recipients recipient
subject "using helpers"
from "tester@example.com"
- body render(:file => "signed_up", :body => { :recipient => recipient })
+ body render(:file => "#{mailer_name}/signed_up", :body => { :recipient => recipient })
end
def initialize_defaults(method_name)
@@ -24,6 +24,22 @@ def initialize_defaults(method_name)
end
end
+class FirstMailer < ActionMailer::Base
+ def share(recipient)
+ recipients recipient
+ subject "using helpers"
+ from "tester@example.com"
+ end
+end
+
+class SecondMailer < ActionMailer::Base
+ def share(recipient)
+ recipients recipient
+ subject "using helpers"
+ from "tester@example.com"
+ end
+end
+
RenderMailer.template_root = File.dirname(__FILE__) + "/fixtures"
class RenderHelperTest < Test::Unit::TestCase
@@ -46,3 +62,23 @@ def test_file_template
end
end
+class FirstSecondHelperTest < Test::Unit::TestCase
+ def setup
+ ActionMailer::Base.delivery_method = :test
+ ActionMailer::Base.perform_deliveries = true
+ ActionMailer::Base.deliveries = []
+
+ @recipient = 'test@localhost'
+ end
+
+ def test_ordering
+ mail = FirstMailer.create_share(@recipient)
+ assert_equal "first mail", mail.body.strip
+ mail = SecondMailer.create_share(@recipient)
+ assert_equal "second mail", mail.body.strip
+ mail = FirstMailer.create_share(@recipient)
+ assert_equal "first mail", mail.body.strip
+ mail = SecondMailer.create_share(@recipient)
+ assert_equal "second mail", mail.body.strip
+ end
+end
View
2  actionmailer/test/mail_service_test.rb
@@ -32,7 +32,7 @@ def multipart_with_template_path_with_dots(recipient)
:body => "not really a jpeg, we're only testing, after all"
end
- def template_path
+ def template_root
"#{File.dirname(__FILE__)}/fixtures/path.with.dots"
end
end
Please sign in to comment.
Something went wrong with that request. Please try again.