Merge remote-tracking branch 'upstream/pull/2954' into master

openstreetmap · Nov 11, 2020 · a2bb438 · a2bb438
2 parents b1d8d73 + 01b72f7
commit a2bb438
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/app/views/layouts/notifier.html.erb → app/views/layouts/user_mailer.html.erb b/app/views/layouts/notifier.html.erb → app/views/layouts/user_mailer.html.erb
diff --git a/test/mailers/user_mailer_test.rb b/test/mailers/user_mailer_test.rb
@@ -0,0 +1,9 @@
+require "test_helper"
+
+class UserMailerTest < ActionMailer::TestCase
+  def test_html_layout_is_used
+    email = UserMailer.message_notification(create(:message))
+
+    assert_match(/<html lang=/, email.html_part.body.to_s)
+  end
+end