Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2

2018-05-28 08:20:12 -04:00
--- 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`.
--- 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<html><body>" + htmlBody + "</body></html>"

--- 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{