From 05460ac3a709063e02f63ba4407828dff344b2cb Mon Sep 17 00:00:00 2001 From: Jason Blais Date: Sun, 27 May 2018 09:55:37 -0400 Subject: Update CONTRIBUTING.md (#8828) * Update CONTRIBUTING.md * Fix typo --- CONTRIBUTING.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 6ac9356c2..af8fcfc8f 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,6 +1,6 @@ # Code Contribution Guidelines -Thank you for your interest in contributing! Please see the [Mattermost Contribution Guide](http://docs.mattermost.com/developer/contribution-guide.html) which describes the process for making code contributions across Mattermost projects. +Thank you for your interest in contributing! Please see the [Mattermost Contribution Guide](http://docs.mattermost.com/developer/contribution-guide.html) which describes the process for making code contributions across Mattermost projects and [join our "Contributors" community channel](https://pre-release.mattermost.com/core/channels/tickets) to ask questions from community members and the Mattermost core team. ### Review Process for this Repo @@ -62,7 +62,7 @@ Two developers will review the pull request and either give feedback or approve Review process is complete and the pull request is merged. - Dev assigns `3: Ready to Merge` label. - - If Mattermost is not in release mode (between [major feature cut and release candidate cut](https://docs.mattermost.com/process/release-process.html), the PR is merged into `master`. + - If Mattermost is not in release mode (between [major feature cut and release candidate cut](https://docs.mattermost.com/process/release-process.html)), the PR is merged into `master`. - If the PR is a major change, merge is postponed until the next release cycle. - Dev calls out on the issue that it is a major change and it will be merged after branching. - Once the current release is branched the PR can be merged into `master`. -- cgit v1.2.3-1-g7c22 From b6d5cc4f696b7438317948710efb860e11c0a1a9 Mon Sep 17 00:00:00 2001 From: Carlos Tadeu Panato Junior Date: Sun, 27 May 2018 15:56:44 +0200 Subject: re-enabling TestSendMailUsingConfigAdvanced (#8836) --- utils/mail.go | 2 +- utils/mail_test.go | 15 ++++++++++----- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/utils/mail.go b/utils/mail.go index 119ca0674..651cd376e 100644 --- a/utils/mail.go +++ b/utils/mail.go @@ -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" + htmlBody + "" diff --git a/utils/mail_test.go b/utils/mail_test.go index 22a50df5f..4cb2d7594 100644 --- a/utils/mail_test.go +++ b/utils/mail_test.go @@ -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{ -- cgit v1.2.3-1-g7c22