Merge pull request #17758 from tgxworld/mailer_generator

Follow up to #17646.

2 files changed, 8 insertions, 0 deletions

diff --git a/railties/test/generators/mailer_generator_test.rb b/railties/test/generators/mailer_generator_test.rb
index 915dde1109..bab15ce172 100644
--- a/railties/test/generators/mailer_generator_test.rb
+++ b/railties/test/generators/mailer_generator_test.rb
@@ -79,10 +79,12 @@ 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_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_match(/<%= @greeting %>/, view)
     end
 
@@ -94,10 +96,12 @@ 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_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_match(/<%= @greeting %>/, view)
     end
 
@@ -109,6 +113,8 @@ 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/layouts/mailer.text.erb"
+    assert_file "app/views/layouts/mailer.html.erb"
   end
 
   def test_logs_if_the_template_engine_cannot_be_found
diff --git a/railties/test/generators/namespaced_generators_test.rb b/railties/test/generators/namespaced_generators_test.rb
index 20e8d2d5d3..6075805152 100644
--- a/railties/test/generators/namespaced_generators_test.rb
+++ b/railties/test/generators/namespaced_generators_test.rb
@@ -174,10 +174,12 @@ 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_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_match(/<%= @greeting %>/, view)
     end
   end