Change mailer generator templates and refactor the whole naming schema.

2 files changed, 10 insertions, 4 deletions

diff --git a/railties/lib/generators/test_unit/mailer/templates/fixture b/railties/lib/generators/test_unit/mailer/templates/fixture
index fcce7bd805..171648d6fd 100644
--- a/railties/lib/generators/test_unit/mailer/templates/fixture
+++ b/railties/lib/generators/test_unit/mailer/templates/fixture
@@ -1,3 +1,3 @@
 <%= class_name %>#<%= @action %>
 
-Find me in app/views/<%= @path %>
+Hi, find me in app/views/<%= @path %>
diff --git a/railties/lib/generators/test_unit/mailer/templates/functional_test.rb b/railties/lib/generators/test_unit/mailer/templates/functional_test.rb
index d7366fea5f..2f694e431c 100644
--- a/railties/lib/generators/test_unit/mailer/templates/functional_test.rb
+++ b/railties/lib/generators/test_unit/mailer/templates/functional_test.rb
@@ -3,11 +3,17 @@ require 'test_helper'
 class <%= class_name %>Test < ActionMailer::TestCase
 <% for action in actions -%>
   test "<%= action %>" do
-    @expected.subject = '<%= class_name %>#<%= action %>'
-    @expected.body    = read_fixture('<%= action %>')
+    @actual = <%= class_name %>.<%= action %>
+
+    @expected.subject = <%= action.to_s.humanize.inspect %>
+    @expected.body    = read_fixture("<%= action %>")
     @expected.date    = Time.now
 
-    assert_equal @expected, <%= class_name %>.create_<%= action %>(@expected.date)
+    assert_difference "<%= class_name %>.deliveries.size" do
+      @actual.deliver
+    end
+
+    assert_equal @expected.encoded, @actual.encoded
   end
 
 <% end -%>