aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorMikel Lindsaar <raasdnil@gmail.com>2010-01-26 18:59:52 +1100
committerMikel Lindsaar <raasdnil@gmail.com>2010-01-26 18:59:52 +1100
commitb8c82edc1f5b95bceea3d40de778ec0cd5a37d15 (patch)
treefe2da52c2b557b2b566fe9123a0b2c0f2240258f /railties
parente297eed4f21a57234ea28fe3dc9265ed8793dba1 (diff)
downloadrails-b8c82edc1f5b95bceea3d40de778ec0cd5a37d15.tar.gz
rails-b8c82edc1f5b95bceea3d40de778ec0cd5a37d15.tar.bz2
rails-b8c82edc1f5b95bceea3d40de778ec0cd5a37d15.zip
Updating generators for mailer to reflect changes in API
Diffstat (limited to 'railties')
-rw-r--r--railties/lib/generators/rails/mailer/templates/mailer.rb4
-rw-r--r--railties/test/generators/mailer_generator_test.rb6
2 files changed, 5 insertions, 5 deletions
diff --git a/railties/lib/generators/rails/mailer/templates/mailer.rb b/railties/lib/generators/rails/mailer/templates/mailer.rb
index 1685b73633..df9d0a0923 100644
--- a/railties/lib/generators/rails/mailer/templates/mailer.rb
+++ b/railties/lib/generators/rails/mailer/templates/mailer.rb
@@ -1,5 +1,5 @@
class <%= class_name %> < ActionMailer::Base
- delivers_from "from@example.com"
+ self.defaults = { :from => "from@example.com" }
<% for action in actions -%>
# Subject can be set in your I18n file at config/locales/en.yml
@@ -9,7 +9,7 @@ class <%= class_name %> < ActionMailer::Base
#
def <%= action %>
@greeting = "Hi"
- mail(:to => "to@example.com")
+ mail(:to => "to@example.org")
end
<% end -%>
end \ No newline at end of file
diff --git a/railties/test/generators/mailer_generator_test.rb b/railties/test/generators/mailer_generator_test.rb
index 99ce53323e..e585298a93 100644
--- a/railties/test/generators/mailer_generator_test.rb
+++ b/railties/test/generators/mailer_generator_test.rb
@@ -9,7 +9,7 @@ class MailerGeneratorTest < Rails::Generators::TestCase
run_generator
assert_file "app/mailers/notifier.rb" do |mailer|
assert_match /class Notifier < ActionMailer::Base/, mailer
- assert_match /delivers_from "from@example.com"/, mailer
+ assert_match /self\.defaults\ =\ \{\ :from\ =>\ "from@example\.com"\ \}/, mailer
end
end
@@ -61,12 +61,12 @@ class MailerGeneratorTest < Rails::Generators::TestCase
assert_file "app/mailers/notifier.rb" do |mailer|
assert_instance_method :foo, mailer do |foo|
- assert_match /mail\(:to => "to@example.com"\)/, foo
+ assert_match /mail\(:to => "to@example.org"\)/, foo
assert_match /@greeting = "Hi"/, foo
end
assert_instance_method :bar, mailer do |bar|
- assert_match /mail\(:to => "to@example.com"\)/, bar
+ assert_match /mail\(:to => "to@example.org"\)/, bar
assert_match /@greeting = "Hi"/, bar
end
end