Merge branch 'rails/master' into ujs

2 files changed, 7 insertions, 6 deletions

diff --git a/railties/lib/generators/rails/mailer/templates/mailer.rb b/railties/lib/generators/rails/mailer/templates/mailer.rb
index cdc6e41266..7343eb28b3 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
-  self.defaults :from => "from@example.com"
+  default :from => "from@example.com"
 <% for action in actions -%>
 
   # Subject can be set in your I18n file at config/locales/en.yml
@@ -9,7 +9,8 @@ class <%= class_name %> < ActionMailer::Base
   #
   def <%= action %>
     @greeting = "Hi"
-    mail(:to => "to@example.org")
+
+    mail :to => "to@example.org"
   end
 <% end -%>
-end
\ No newline at end of file
+end
diff --git a/railties/test/generators/mailer_generator_test.rb b/railties/test/generators/mailer_generator_test.rb
index 0b7f5c6817..e6fc1bbb5c 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 /self\.defaults :from => "from@example.com"/, mailer
+      assert_match /default :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.org"\)/, 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.org"\)/, bar
+        assert_match /mail :to => "to@example.org"/, bar
         assert_match /@greeting = "Hi"/, bar
       end
     end