Merge pull request #18393 from y-yagi/fix_mailer

follow up to #18074

6 files changed, 38 insertions, 20 deletions

diff --git a/actionmailer/lib/rails/generators/mailer/USAGE b/actionmailer/lib/rails/generators/mailer/USAGE
index d9d9d064d8..2b0a078109 100644
--- a/actionmailer/lib/rails/generators/mailer/USAGE
+++ b/actionmailer/lib/rails/generators/mailer/USAGE
@@ -12,6 +12,6 @@ Example:
 
     creates a Notifications mailer class, views, and test:
         Mailer:     app/mailers/notifications_mailer.rb
-        Views:      app/views/notifications/signup.text.erb [...]
-        Test:       test/mailers/notifications_test.rb
+        Views:      app/views/notifications_mailer/signup.text.erb [...]
+        Test:       test/mailers/notifications_mailer_test.rb
 
diff --git a/railties/lib/rails/generators/erb/mailer/mailer_generator.rb b/railties/lib/rails/generators/erb/mailer/mailer_generator.rb
index 7d27321610..65563aa6db 100644
--- a/railties/lib/rails/generators/erb/mailer/mailer_generator.rb
+++ b/railties/lib/rails/generators/erb/mailer/mailer_generator.rb
@@ -6,7 +6,7 @@ module Erb # :nodoc:
       argument :actions, type: :array, default: [], banner: "method method"
 
       def copy_view_files
-        view_base_path = File.join("app/views", class_path, file_name)
+        view_base_path = File.join("app/views", class_path, file_name + '_mailer')
         empty_directory view_base_path
 
         if self.behavior == :invoke
@@ -31,6 +31,10 @@ module Erb # :nodoc:
       def formats
         [:text, :html]
       end
+
+      def file_name
+        @_file_name ||= super.gsub(/\_mailer/i, '')
+      end
     end
   end
 end
diff --git a/railties/lib/rails/generators/test_unit/mailer/mailer_generator.rb b/railties/lib/rails/generators/test_unit/mailer/mailer_generator.rb
index ba131da79d..343c8a3949 100644
--- a/railties/lib/rails/generators/test_unit/mailer/mailer_generator.rb
+++ b/railties/lib/rails/generators/test_unit/mailer/mailer_generator.rb
@@ -16,6 +16,11 @@ module TestUnit # :nodoc:
       def create_preview_files
         template "preview.rb", File.join('test/mailers/previews', class_path, "#{file_name}_mailer_preview.rb")
       end
+
+      protected
+        def file_name
+          @_file_name ||= super.gsub(/\_mailer/i, '')
+        end
     end
   end
 end
diff --git a/railties/lib/rails/generators/test_unit/mailer/templates/functional_test.rb b/railties/lib/rails/generators/test_unit/mailer/templates/functional_test.rb
index 3cee517db3..a2f2d30de5 100644
--- a/railties/lib/rails/generators/test_unit/mailer/templates/functional_test.rb
+++ b/railties/lib/rails/generators/test_unit/mailer/templates/functional_test.rb
@@ -4,7 +4,7 @@ require 'test_helper'
 class <%= class_name %>MailerTest < ActionMailer::TestCase
 <% actions.each do |action| -%>
   test "<%= action %>" do
-    mail = <%= class_name %>.<%= action %>
+    mail = <%= class_name %>Mailer.<%= action %>
     assert_equal <%= action.to_s.humanize.inspect %>, mail.subject
     assert_equal ["to@example.org"], mail.to
     assert_equal ["from@example.com"], mail.from
diff --git a/railties/test/generators/mailer_generator_test.rb b/railties/test/generators/mailer_generator_test.rb
index febd2fd12e..584e7a82aa 100644
--- a/railties/test/generators/mailer_generator_test.rb
+++ b/railties/test/generators/mailer_generator_test.rb
@@ -78,13 +78,13 @@ class MailerGeneratorTest < Rails::Generators::TestCase
 
   def test_invokes_default_text_template_engine
     run_generator
-    assert_file "app/views/notifier/foo.text.erb" do |view|
-      assert_match(%r(\sapp/views/notifier/foo\.text\.erb), view)
+    assert_file "app/views/notifier_mailer/foo.text.erb" do |view|
+      assert_match(%r(\sapp/views/notifier_mailer/foo\.text\.erb), view)
       assert_match(/<%= @greeting %>/, view)
     end
 
-    assert_file "app/views/notifier/bar.text.erb" do |view|
-      assert_match(%r(\sapp/views/notifier/bar\.text\.erb), view)
+    assert_file "app/views/notifier_mailer/bar.text.erb" do |view|
+      assert_match(%r(\sapp/views/notifier_mailer/bar\.text\.erb), view)
       assert_match(/<%= @greeting %>/, view)
     end
 
@@ -95,13 +95,13 @@ class MailerGeneratorTest < Rails::Generators::TestCase
 
   def test_invokes_default_html_template_engine
     run_generator
-    assert_file "app/views/notifier/foo.html.erb" do |view|
-      assert_match(%r(\sapp/views/notifier/foo\.html\.erb), view)
+    assert_file "app/views/notifier_mailer/foo.html.erb" do |view|
+      assert_match(%r(\sapp/views/notifier_mailer/foo\.html\.erb), view)
       assert_match(/<%= @greeting %>/, view)
     end
 
-    assert_file "app/views/notifier/bar.html.erb" do |view|
-      assert_match(%r(\sapp/views/notifier/bar\.html\.erb), view)
+    assert_file "app/views/notifier_mailer/bar.html.erb" do |view|
+      assert_match(%r(\sapp/views/notifier_mailer/bar\.html\.erb), view)
       assert_match(/<%= @greeting %>/, view)
     end
 
@@ -112,7 +112,7 @@ class MailerGeneratorTest < Rails::Generators::TestCase
 
   def test_invokes_default_template_engine_even_with_no_action
     run_generator ["notifier"]
-    assert_file "app/views/notifier"
+    assert_file "app/views/notifier_mailer"
     assert_file "app/views/layouts/mailer.text.erb"
     assert_file "app/views/layouts/mailer.html.erb"
   end
@@ -133,8 +133,8 @@ class MailerGeneratorTest < Rails::Generators::TestCase
       assert_match(/class Farm::AnimalMailerPreview < ActionMailer::Preview/, preview)
       assert_match(/\# Preview this email at http:\/\/localhost\:3000\/rails\/mailers\/farm\/animal\/moos/, preview)
     end
-    assert_file "app/views/farm/animal/moos.text.erb"
-    assert_file "app/views/farm/animal/moos.html.erb"
+    assert_file "app/views/farm/animal_mailer/moos.text.erb"
+    assert_file "app/views/farm/animal_mailer/moos.html.erb"
   end
 
   def test_actions_are_turned_into_methods
@@ -173,5 +173,14 @@ class MailerGeneratorTest < Rails::Generators::TestCase
 
     assert_no_file "app/mailers/notifier_mailer_mailer.rb"
     assert_file "app/mailers/notifier_mailer.rb"
+
+    assert_no_file "app/views/notifier_mailer_mailer/"
+    assert_file "app/views/notifier_mailer/"
+
+    assert_no_file "test/mailers/notifier_mailer_mailer_test.rb"
+    assert_file "test/mailers/notifier_mailer_test.rb"
+
+    assert_no_file "test/mailers/previews/notifier_mailer_mailer_preview.rb"
+    assert_file "test/mailers/previews/notifier_mailer_preview.rb"
   end
 end
diff --git a/railties/test/generators/namespaced_generators_test.rb b/railties/test/generators/namespaced_generators_test.rb
index d0ea01dfb0..e839b67960 100644
--- a/railties/test/generators/namespaced_generators_test.rb
+++ b/railties/test/generators/namespaced_generators_test.rb
@@ -173,20 +173,20 @@ class NamespacedMailerGeneratorTest < NamespacedGeneratorTestCase
 
   def test_invokes_default_template_engine
     run_generator
-    assert_file "app/views/test_app/notifier/foo.text.erb" do |view|
-      assert_match(%r(app/views/test_app/notifier/foo\.text\.erb), view)
+    assert_file "app/views/test_app/notifier_mailer/foo.text.erb" do |view|
+      assert_match(%r(app/views/test_app/notifier_mailer/foo\.text\.erb), view)
       assert_match(/<%= @greeting %>/, view)
     end
 
-    assert_file "app/views/test_app/notifier/bar.text.erb" do |view|
-      assert_match(%r(app/views/test_app/notifier/bar\.text\.erb), view)
+    assert_file "app/views/test_app/notifier_mailer/bar.text.erb" do |view|
+      assert_match(%r(app/views/test_app/notifier_mailer/bar\.text\.erb), view)
       assert_match(/<%= @greeting %>/, view)
     end
   end
 
   def test_invokes_default_template_engine_even_with_no_action
     run_generator ["notifier"]
-    assert_file "app/views/test_app/notifier"
+    assert_file "app/views/test_app/notifier_mailer"
   end
 end