IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

re-enabling TestSendMailUsingConfigAdvanced (#8836)

Browse Source
This commit is contained in:
Carlos Tadeu Panato Junior
2018-05-27 15:56:44 +02:00
committed by Joram Wilander
parent 05460ac3a7
commit b6d5cc4f69
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
utils/mail.go
View File

@@ -229,7 +229,7 @@ func SendMailUsingConfigAdvanced(mimeTo, smtpTo string, from mail.Address, subje
}
func SendMail(c *smtp.Client, mimeTo, smtpTo string, from mail.Address, subject, htmlBody string, attachments []*model.FileInfo, mimeHeaders map[string]string, fileBackend FileBackend, date time.Time) *model.AppError {
mlog.Debug(fmt.Sprintf("sending mail to %v with subject of '%v'", mimeTo, subject))
mlog.Debug(fmt.Sprintf("sending mail to %v with subject of '%v'", smtpTo, subject))
htmlMessage := "\r\n<html><body>" + htmlBody + "</body></html>"

15
utils/mail_test.go
View File

@@ -4,11 +4,16 @@
package utils
import (
"bytes"
"fmt"
"strings"
"testing"
"net/mail"
"net/smtp"
"github.com/mattermost/mattermost-server/model"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
@@ -127,8 +132,8 @@ func TestSendMailUsingConfig(t *testing.T) {
}
}
/*func TestSendMailUsingConfigAdvanced(t *testing.T) {
cfg, _, err := LoadConfig("config.json")
func TestSendMailUsingConfigAdvanced(t *testing.T) {
cfg, _, _, err := LoadConfig("config.json")
require.Nil(t, err)
T = GetUserTranslations("en")
@@ -150,9 +155,9 @@ func TestSendMailUsingConfig(t *testing.T) {
filePath2 := fmt.Sprintf("test2/%s", fileName)
fileContents1 := []byte("hello world")
fileContents2 := []byte("foo bar")
_, err := fileBackend.WriteFile(bytes.NewReader(fileContents1), filePath1)
_, err = fileBackend.WriteFile(bytes.NewReader(fileContents1), filePath1)
assert.Nil(t, err)
_, err := fileBackend.WriteFile(bytes.NewReader(fileContents2), filePath2)
_, err = fileBackend.WriteFile(bytes.NewReader(fileContents2), filePath2)
assert.Nil(t, err)
defer fileBackend.RemoveFile(filePath1)
defer fileBackend.RemoveFile(filePath2)
@@ -221,7 +226,7 @@ func TestSendMailUsingConfig(t *testing.T) {
}
}
}
}*/
}
func TestAuthMethods(t *testing.T) {
auth := &authChooser{