Merge pull request #308 from rails/272-flavorjones-fix-generator-mailer-nested

flavorjones · web-flow · commit 771d3ad25cb6 · 2024-01-07T14:21:29.000-05:00
fix: mailer generation with namespaces
diff --git a/lib/generators/tailwindcss/mailer/templates/layout.html.erb.tt b/lib/generators/tailwindcss/mailer/templates/layout.html.erb.tt
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+    <style>
+      /* Email styles need to be inline */
+    </style>
+  </head>
+
+  <body>
+    <%%= yield %>
+  </body>
+</html>
diff --git a/lib/generators/tailwindcss/mailer/templates/layout.text.erb.tt b/lib/generators/tailwindcss/mailer/templates/layout.text.erb.tt
@@ -0,0 +1 @@
+<%%= yield %>
diff --git a/test/lib/generators/tailwindcss/mailer_generator_test.rb b/test/lib/generators/tailwindcss/mailer_generator_test.rb
@@ -3,7 +3,7 @@
 require "generators/tailwindcss/mailer/mailer_generator"
 
 class Tailwindcss::Generators::MailerGeneratorTest < Rails::Generators::TestCase
-  tests Rails::Generators::MailerGenerator
+  tests Tailwindcss::Generators::MailerGenerator
   destination Dir.mktmpdir
 
   arguments %w(Notifications invoice)
@@ -20,6 +20,36 @@ class Tailwindcss::Generators::MailerGeneratorTest < Rails::Generators::TestCase
       assert_match %r(app/views/notifications_mailer/invoice\.text\.erb), view
       assert_match(/\= @greeting/, view)
     end
+
+    assert_file "app/views/layouts/mailer.text.erb" do |view|
+      assert_match("<%= yield %>", view)
+    end
+
+    assert_file "app/views/layouts/mailer.html.erb" do |view|
+      assert_match("<%= yield %>", view)
+    end
+  end
+
+  test "generates correct mailer view templates with namespace" do
+    run_generator ["admin/notifications", "invoice"]
+
+    assert_file "app/views/admin/notifications_mailer/invoice.html.erb" do |view|
+      assert_match %r(app/views/admin/notifications_mailer/invoice\.html\.erb), view
+      assert_match(/\= @greeting/, view)
+    end
+
+    assert_file "app/views/admin/notifications_mailer/invoice.text.erb" do |view|
+      assert_match %r(app/views/admin/notifications_mailer/invoice\.text\.erb), view
+      assert_match(/\= @greeting/, view)
+    end
+
+    assert_file "app/views/layouts/admin/mailer.text.erb" do |view|
+      assert_match("<%= yield %>", view)
+    end
+
+    assert_file "app/views/layouts/admin/mailer.html.erb" do |view|
+      assert_match("<%= yield %>", view)
+    end
   end
 end
 
