aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer/test/mail_service_test.rb
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2006-06-29 01:54:16 +0000
committerJeremy Kemper <jeremy@bitsweat.net>2006-06-29 01:54:16 +0000
commit1fd9a46d713a4b314621bd7cf171bd048b10741f (patch)
tree86f5aa702b43bacee7a3f982b191dac5f4ec7d3c /actionmailer/test/mail_service_test.rb
parent5b866f75a7ba5970a51a91cf643d03cc89f5c4c3 (diff)
downloadrails-1fd9a46d713a4b314621bd7cf171bd048b10741f.tar.gz
rails-1fd9a46d713a4b314621bd7cf171bd048b10741f.tar.bz2
rails-1fd9a46d713a4b314621bd7cf171bd048b10741f.zip
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
Diffstat (limited to 'actionmailer/test/mail_service_test.rb')
-rwxr-xr-xactionmailer/test/mail_service_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionmailer/test/mail_service_test.rb b/actionmailer/test/mail_service_test.rb
index c810cf1090..aa9002a262 100755
--- a/actionmailer/test/mail_service_test.rb
+++ b/actionmailer/test/mail_service_test.rb
@@ -32,7 +32,7 @@ class FunkyPathMailer < ActionMailer::Base
: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