Skip to content

Don't raise when a layout is set for only one of html/text #65

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pcbeingused333 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Don't raise when a layout is set for only one of html/text #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/courrier/email/layouts.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@ def build
def no_layouts? = @email.class.layouts.nil?

def layouts
FORMATS.map(&:to_sym).to_h do |format|
FORMATS.map(&:to_sym).filter_map do |format|
template = @email.class.layouts[format]

next if template.nil?

[format, render(template)]
end
end.to_h
end

def render(template)
Expand Down
20 changes: 20 additions & 0 deletions test/courrier/email/layouts_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,24 @@ def test_mixed_layouts

assert_equal expected, Courrier::Email::Layouts.new(email).build
end

def test_html_only_layout
email = TestEmailWithHtmlOnlyLayout.new(
from: "devs@railsdesigner.com",
to: "recipient@railsdesigner.com"
)

assert_equal [{ html: "<html>%{content}</html>" }], Courrier::Email::Layouts.new(email).build
assert_equal "<html><p>Body</p></html>", email.options.html
end

def test_text_only_layout
email = TestEmailWithTextOnlyLayout.new(
from: "devs@railsdesigner.com",
to: "recipient@railsdesigner.com"
)

assert_equal [{ text: "%{content}\n\nThanks!" }], Courrier::Email::Layouts.new(email).build
assert_equal "Body\n\nThanks!", email.options.text
end
end
13 changes: 13 additions & 0 deletions test/fixtures/test_email_with_single_format_layouts.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
require "courrier/email"

class TestEmailWithHtmlOnlyLayout < Courrier::Email
layout html: "<html>%{content}</html>"

def html = "<p>Body</p>"
end

class TestEmailWithTextOnlyLayout < Courrier::Email
layout text: "%{content}\n\nThanks!"

def text = "Body"
end
Loading