upstream/mattermost
1
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2026-05-28 04:35:04 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fixes errcheck in email_test.go (#28910)

Browse source 
Co-authored-by: Ben Schumacher <ben.schumacher@mattermost.com>
This commit is contained in:
Harshit Vashisht 2024-11-04 16:46:35 +05:30 committed by GitHub
parent a21e8f9b13
commit 59c42c06ef
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 22 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
server/.golangci.yml
View file

@ -96,7 +96,6 @@ issues:
channels/app/channel_test.go|\
channels/app/config_test.go|\
channels/app/desktop_login.go|\
channels/app/email/email_test.go|\
channels/app/export.go|\
channels/app/export_test.go|\
channels/app/file.go|\

36
server/channels/app/email/email_test.go
View file

@ -73,9 +73,10 @@ func TestSendInviteEmails(t *testing.T) {
*cfg.EmailSettings.SendEmailNotifications = false
})
t.Run("SendInviteEmails", func(t *testing.T) {
mail.DeleteMailBox(emailTo)
err := mail.DeleteMailBox(emailTo)
require.NoError(t, err, "Failed to delete mailbox")
err := th.service.SendInviteEmails(th.BasicTeam, "test-user", th.BasicUser.Id, []string{emailTo}, "http://testserver", nil, false, false, false)
err = th.service.SendInviteEmails(th.BasicTeam, "test-user", th.BasicUser.Id, []string{emailTo}, "http://testserver", nil, false, false, false)
require.NoError(t, err)
verifyMailbox(t)
@ -100,9 +101,10 @@ func TestSendInviteEmails(t *testing.T) {
})
t.Run("SendGuestInviteEmails", func(t *testing.T) {
mail.DeleteMailBox(emailTo)
err := mail.DeleteMailBox(emailTo)
require.NoError(t, err, "Failed to delete mailbox")
err := th.service.SendGuestInviteEmails(
err = th.service.SendGuestInviteEmails(
th.BasicTeam,
[]*model.Channel{th.BasicChannel},
"test-user",
@ -163,10 +165,11 @@ func TestSendInviteEmails(t *testing.T) {
})
t.Run("SendGuestInviteEmails should sanitize HTML input", func(t *testing.T) {
mail.DeleteMailBox(emailTo)
err := mail.DeleteMailBox(emailTo)
require.NoError(t, err, "Failed to delete mailbox")
message := `<a href="http://testserver">sanitized message</a>`
err := th.service.SendGuestInviteEmails(
err = th.service.SendGuestInviteEmails(
th.BasicTeam,
[]*model.Channel{th.BasicChannel},
"test-user",
@ -188,9 +191,10 @@ func TestSendInviteEmails(t *testing.T) {
})
t.Run("SendInviteEmails should contain button URL with 'started by role' param for system user", func(t *testing.T) {
mail.DeleteMailBox(emailTo)
err := mail.DeleteMailBox(emailTo)
require.NoError(t, err, "Failed to delete mailbox")
err := th.service.SendInviteEmails(
err = th.service.SendInviteEmails(
th.BasicTeam,
"test-user",
th.BasicUser.Id,
@ -208,9 +212,10 @@ func TestSendInviteEmails(t *testing.T) {
})
t.Run("SendInviteEmails should contain button URL with 'started by role' param for system admin", func(t *testing.T) {
mail.DeleteMailBox(emailTo)
err := mail.DeleteMailBox(emailTo)
require.NoError(t, err, "Failed to delete mailbox")
err := th.service.SendInviteEmails(
err = th.service.SendInviteEmails(
th.BasicTeam,
"test-user",
th.BasicUser.Id,
@ -228,9 +233,10 @@ func TestSendInviteEmails(t *testing.T) {
})
t.Run("SendInviteEmails should contain button URL with 'started by role' param for first system admin", func(t *testing.T) {
mail.DeleteMailBox(emailTo)
err := mail.DeleteMailBox(emailTo)
require.NoError(t, err, "Failed to delete mailbox")
err := th.service.SendInviteEmails(
err = th.service.SendInviteEmails(
th.BasicTeam,
"test-user",
th.BasicUser.Id,
@ -276,9 +282,11 @@ func TestSendCloudWelcomeEmail(t *testing.T) {
require.Contains(t, resultsEmail.Subject, "Congratulations!", "Wrong subject message %s", resultsEmail.Subject)
require.Contains(t, resultsEmail.Body.Text, "Your workspace is ready to go!", "Wrong body %s", resultsEmail.Body.Text)
}
mail.DeleteMailBox(emailTo)
err := th.service.SendCloudWelcomeEmail(emailTo, th.BasicUser.Locale, "inviteID", "SomeName", "example.com", "https://example.com")
err := mail.DeleteMailBox(emailTo)
require.NoError(t, err, "Failed to delete mailbox")
err = th.service.SendCloudWelcomeEmail(emailTo, th.BasicUser.Locale, "inviteID", "SomeName", "example.com", "https://example.com")
require.NoError(t, err)
verifyMailbox(t)