Skip to content

Issue #396 - Fix MailHelper null issue #397

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

Merged
merged 1 commit into from
Feb 15, 2017
Merged

Issue #396 - Fix MailHelper null issue #397

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
36 changes: 30 additions & 6 deletions src/SendGrid/Helpers/Mail/MailHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,16 @@ public static SendGridMessage CreateSingleEmail(
var msg = new SendGridMessage();
msg.SetFrom(from);
msg.SetSubject(subject);
msg.AddContent(MimeType.Text, plainTextContent);
msg.AddContent(MimeType.Html, htmlContent);
if (plainTextContent != null)
{
msg.AddContent(MimeType.Text, plainTextContent);
}

if (htmlContent != null)
{
msg.AddContent(MimeType.Html, htmlContent);
}

msg.AddTo(to);
return msg;
}
Expand All @@ -56,8 +64,16 @@ public static SendGridMessage CreateSingleEmailToMultipleRecipients(
var msg = new SendGridMessage();
msg.SetFrom(from);
msg.SetGlobalSubject(subject);
msg.AddContent(MimeType.Text, plainTextContent);
msg.AddContent(MimeType.Html, htmlContent);
if (plainTextContent != null)
{
msg.AddContent(MimeType.Text, plainTextContent);
}

if (htmlContent != null)
{
msg.AddContent(MimeType.Html, htmlContent);
}

for (var i = 0; i < tos.Count; i++)
{
msg.AddTo(tos[i], i);
Expand Down Expand Up @@ -86,8 +102,16 @@ public static SendGridMessage CreateMultipleEmailsToMultipleRecipients(
{
var msg = new SendGridMessage();
msg.SetFrom(from);
msg.AddContent(MimeType.Text, plainTextContent);
msg.AddContent(MimeType.Html, htmlContent);
if (plainTextContent != null)
{
msg.AddContent(MimeType.Text, plainTextContent);
}

if (htmlContent != null)
{
msg.AddContent(MimeType.Html, htmlContent);
}

for (var i = 0; i < tos.Count; i++)
{
msg.AddTo(tos[i], i);
Expand Down
53 changes: 53 additions & 0 deletions tests/SendGrid.Tests/Integration.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,6 +316,20 @@ public void TestCreateSingleEmail()
"Plain Text Content",
"HTML Content");
Assert.True(msg.Serialize() == "{\"from\":{\"name\":\"Example User\",\"email\":\"test@example.com\"},\"personalizations\":[{\"to\":[{\"email\":\"test@example.com\"}],\"subject\":\"Test Subject\"}],\"content\":[{\"type\":\"text/plain\",\"value\":\"Plain Text Content\"},{\"type\":\"text/html\",\"value\":\"HTML Content\"}]}");

var msg2 = MailHelper.CreateSingleEmail(new EmailAddress("test@example.com", "Example User"),
new EmailAddress("test@example.com"),
"Test Subject",
null,
"HTML Content");
Assert.True(msg2.Serialize() == "{\"from\":{\"name\":\"Example User\",\"email\":\"test@example.com\"},\"personalizations\":[{\"to\":[{\"email\":\"test@example.com\"}],\"subject\":\"Test Subject\"}],\"content\":[{\"type\":\"text/html\",\"value\":\"HTML Content\"}]}");

var msg3 = MailHelper.CreateSingleEmail(new EmailAddress("test@example.com", "Example User"),
new EmailAddress("test@example.com"),
"Test Subject",
"Plain Text Content",
null);
Assert.True(msg3.Serialize() == "{\"from\":{\"name\":\"Example User\",\"email\":\"test@example.com\"},\"personalizations\":[{\"to\":[{\"email\":\"test@example.com\"}],\"subject\":\"Test Subject\"}],\"content\":[{\"type\":\"text/plain\",\"value\":\"Plain Text Content\"}]}");
}

[Fact]
Expand All @@ -332,6 +346,23 @@ public void TestCreateSingleEmailToMultipleRecipients()
"HTML Content"
);
Assert.True(msg.Serialize() == "{\"from\":{\"name\":\"Example User\",\"email\":\"test@example.com\"},\"subject\":\"Test Subject\",\"personalizations\":[{\"to\":[{\"email\":\"test1@example.com\"}]},{\"to\":[{\"email\":\"test2@example.com\"}]},{\"to\":[{\"email\":\"test3@example.com\"}]}],\"content\":[{\"type\":\"text/plain\",\"value\":\"Plain Text Content\"},{\"type\":\"text/html\",\"value\":\"HTML Content\"}]}");

var msg2 = MailHelper.CreateSingleEmailToMultipleRecipients(new EmailAddress("test@example.com", "Example User"),
emails,
"Test Subject",
null,
"HTML Content"
);
Assert.True(msg2.Serialize() == "{\"from\":{\"name\":\"Example User\",\"email\":\"test@example.com\"},\"subject\":\"Test Subject\",\"personalizations\":[{\"to\":[{\"email\":\"test1@example.com\"}]},{\"to\":[{\"email\":\"test2@example.com\"}]},{\"to\":[{\"email\":\"test3@example.com\"}]}],\"content\":[{\"type\":\"text/html\",\"value\":\"HTML Content\"}]}");

var msg3 = MailHelper.CreateSingleEmailToMultipleRecipients(new EmailAddress("test@example.com", "Example User"),
emails,
"Test Subject",
"Plain Text Content",
null
);
Assert.True(msg3.Serialize() == "{\"from\":{\"name\":\"Example User\",\"email\":\"test@example.com\"},\"subject\":\"Test Subject\",\"personalizations\":[{\"to\":[{\"email\":\"test1@example.com\"}]},{\"to\":[{\"email\":\"test2@example.com\"}]},{\"to\":[{\"email\":\"test3@example.com\"}]}],\"content\":[{\"type\":\"text/plain\",\"value\":\"Plain Text Content\"}]}");

}

[Fact]
Expand Down Expand Up @@ -359,6 +390,28 @@ public void TestCreateMultipleEmailsToMultipleRecipients()
substitutions
);
Assert.True(msg.Serialize() == "{\"from\":{\"name\":\"Example User\",\"email\":\"test@example.com\"},\"personalizations\":[{\"to\":[{\"email\":\"test1@example.com\"}],\"subject\":\"Test Subject1\",\"substitutions\":{\"-name-\":\"Name1\"}},{\"to\":[{\"email\":\"test2@example.com\"}],\"subject\":\"Test Subject2\",\"substitutions\":{\"-name-\":\"Name1\"}},{\"to\":[{\"email\":\"test3@example.com\"}],\"subject\":\"Test Subject3\",\"substitutions\":{\"-name-\":\"Name1\"}}],\"content\":[{\"type\":\"text/plain\",\"value\":\"Hello -name-\"},{\"type\":\"text/html\",\"value\":\"Goodbye -name-\"}]}");

plainTextContent = null;
htmlContent = "Goodbye -name-";
var msg2 = MailHelper.CreateMultipleEmailsToMultipleRecipients(new EmailAddress("test@example.com", "Example User"),
emails,
subjects,
plainTextContent,
htmlContent,
substitutions
);
Assert.True(msg2.Serialize() == "{\"from\":{\"name\":\"Example User\",\"email\":\"test@example.com\"},\"personalizations\":[{\"to\":[{\"email\":\"test1@example.com\"}],\"subject\":\"Test Subject1\",\"substitutions\":{\"-name-\":\"Name1\"}},{\"to\":[{\"email\":\"test2@example.com\"}],\"subject\":\"Test Subject2\",\"substitutions\":{\"-name-\":\"Name1\"}},{\"to\":[{\"email\":\"test3@example.com\"}],\"subject\":\"Test Subject3\",\"substitutions\":{\"-name-\":\"Name1\"}}],\"content\":[{\"type\":\"text/html\",\"value\":\"Goodbye -name-\"}]}");

plainTextContent = "Hello -name-";
htmlContent = null;
var msg3 = MailHelper.CreateMultipleEmailsToMultipleRecipients(new EmailAddress("test@example.com", "Example User"),
emails,
subjects,
plainTextContent,
htmlContent,
substitutions
);
Assert.True(msg3.Serialize() == "{\"from\":{\"name\":\"Example User\",\"email\":\"test@example.com\"},\"personalizations\":[{\"to\":[{\"email\":\"test1@example.com\"}],\"subject\":\"Test Subject1\",\"substitutions\":{\"-name-\":\"Name1\"}},{\"to\":[{\"email\":\"test2@example.com\"}],\"subject\":\"Test Subject2\",\"substitutions\":{\"-name-\":\"Name1\"}},{\"to\":[{\"email\":\"test3@example.com\"}],\"subject\":\"Test Subject3\",\"substitutions\":{\"-name-\":\"Name1\"}}],\"content\":[{\"type\":\"text/plain\",\"value\":\"Hello -name-\"}]}");
}

[Fact]
Expand Down