aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorMislav Marohnić <mislav.marohnic@gmail.com>2008-04-18 17:19:28 -0500
committerJoshua Peek <josh@joshpeek.com>2008-04-18 17:19:28 -0500
commit69a5c1df8293fc8de2cec0fc9fa18181cb9ad469 (patch)
treef35567f2744c7e36a734d544818cbafc06d6c52e /railties
parent29ea0f68aa515f29fe440dabf6d40807e348b703 (diff)
downloadrails-69a5c1df8293fc8de2cec0fc9fa18181cb9ad469.tar.gz
rails-69a5c1df8293fc8de2cec0fc9fa18181cb9ad469.tar.bz2
rails-69a5c1df8293fc8de2cec0fc9fa18181cb9ad469.zip
Add example for default_url_options[:host] to generated mailers.
Signed-off-by: Joshua Peek <josh@joshpeek.com>
Diffstat (limited to 'railties')
-rw-r--r--railties/lib/rails_generator/generators/components/mailer/templates/mailer.rb6
-rw-r--r--railties/test/generators/rails_mailer_generator_test.rb5
2 files changed, 9 insertions, 2 deletions
diff --git a/railties/lib/rails_generator/generators/components/mailer/templates/mailer.rb b/railties/lib/rails_generator/generators/components/mailer/templates/mailer.rb
index 3a1724a62e..0c7e6bebaf 100644
--- a/railties/lib/rails_generator/generators/components/mailer/templates/mailer.rb
+++ b/railties/lib/rails_generator/generators/components/mailer/templates/mailer.rb
@@ -1,4 +1,7 @@
class <%= class_name %> < ActionMailer::Base
+
+ # change to your domain name
+ default_url_options[:host] = 'example.com'
<% for action in actions -%>
def <%= action %>(sent_at = Time.now)
@@ -7,7 +10,8 @@ class <%= class_name %> < ActionMailer::Base
from ''
sent_on sent_at
- body :action => '<%= action %>'
+ body :greeting => 'Hi,'
end
<% end -%>
+
end
diff --git a/railties/test/generators/rails_mailer_generator_test.rb b/railties/test/generators/rails_mailer_generator_test.rb
index 3cf8cda442..03170c3b61 100644
--- a/railties/test/generators/rails_mailer_generator_test.rb
+++ b/railties/test/generators/rails_mailer_generator_test.rb
@@ -13,10 +13,13 @@ class RailsMailerGeneratorTest < GeneratorTestCase
"from ''",
"sent_on sent_at",
"",
- "body :action => 'reset_password'"
+ "body :greeting => 'Hi,'"
],
body.split("\n").map{|line| line.sub(' '*4, '') }
end
+
+ assert_match /^ default_url_options\[:host\] = 'example.com'$/m, model,
+ 'model should include default_url_options :host declaration'
end
assert_generated_views_for :notifier, 'reset_password.erb'