Fix test

Author: lunny

services/mailer/sender/message.go

@@ -6,6 +6,7 @@ package sender
 import (
 	"fmt"
 	"hash/fnv"
+	"net/mail"
 	"strings"
 	"time"
 
@@ -33,7 +34,8 @@ type Message struct {
 // ToMessage converts a Message to gomail.Message
 func (m *Message) ToMessage() *gomail.Msg {
 	msg := gomail.NewMsg()
-	_ = msg.SetAddrHeader("From", m.FromAddress, m.FromDisplayName)
+	addr := mail.Address{Name: m.FromDisplayName, Address: m.FromAddress}
+	_ = msg.SetAddrHeader("From", addr.String())
 	msg.SetGenHeader("To", m.To)
 	if m.ReplyTo != "" {
 		msg.SetGenHeader("Reply-To", m.ReplyTo)

services/mailer/sender/message_test.go

@@ -39,11 +39,13 @@ func TestGenerateMessageID(t *testing.T) {
 }
 
 func TestToMessage(t *testing.T) {
-	oldConf := *setting.MailService
+	oldConf := setting.MailService
 	defer func() {
-		setting.MailService = &oldConf
+		setting.MailService = oldConf
 	}()
-	setting.MailService.From = "[email protected]"
+	setting.MailService = &setting.Mailer{
+		From: "[email protected]",
+	}
 
 	m1 := Message{
 		Info:            "info",
@@ -56,7 +58,7 @@ func TestToMessage(t *testing.T) {
 
 	assertHeaders := func(t *testing.T, expected, header map[string]string) {
 		for k, v := range expected {
-			assert.Equal(t, v, header[k])
+			assert.Equal(t, v, header[k], "Header %s should be %s but got %s", k, v, header[k])
 		}
 	}
 
@@ -69,7 +71,7 @@ func TestToMessage(t *testing.T) {
 		"Date":                     "Mon, 01 Jan 0001 00:00:00 +0000",
 		"From":                     "\"Test Gitea\" <[email protected]>",
 		"Message-ID":               "<autogen--6795364578871-69c000786adc60dc@localhost>",
-		"Mime-Version":             "1.0",
+		"MIME-Version":             "1.0",
 		"Subject":                  "Issue X Closed",
 		"To":                       "[email protected]",
 		"X-Auto-Response-Suppress": "All",
@@ -89,7 +91,7 @@ func TestToMessage(t *testing.T) {
 		"Date":                     "Mon, 01 Jan 0001 00:00:00 +0000",
 		"From":                     "\"Test Gitea\" <[email protected]>",
 		"Message-ID":               "",
-		"Mime-Version":             "1.0",
+		"MIME-Version":             "1.0",
 		"Subject":                  "Issue X Closed",
 		"To":                       "[email protected]",
 		"X-Auto-Response-Suppress": "All",