diff options
Diffstat (limited to 'app')
-rw-r--r-- | app/admin.go | 1 | ||||
-rw-r--r-- | app/email_batching.go | 2 | ||||
-rw-r--r-- | app/email_test.go | 4 |
3 files changed, 3 insertions, 4 deletions
diff --git a/app/admin.go b/app/admin.go index 50ed769b6..b9e22a87f 100644 --- a/app/admin.go +++ b/app/admin.go @@ -212,7 +212,6 @@ func TestEmail(userId string, cfg *model.Config) *model.AppError { return model.NewLocAppError("testEmail", "api.admin.test_email.reenter_password", nil, "") } } - if user, err := GetUser(userId); err != nil { return err } else { diff --git a/app/email_batching.go b/app/email_batching.go index b37963a94..e2a2286ce 100644 --- a/app/email_batching.go +++ b/app/email_batching.go @@ -218,7 +218,7 @@ func sendBatchedEmailNotification(userId string, notifications []*batchedNotific body.Props["BodyText"] = translateFunc("api.email_batching.send_batched_email_notification.body_text", len(notifications)) if err := utils.SendMail(user.Email, subject, body.Render()); err != nil { - l4g.Warn(utils.T("api.email_batching.send_batched_email_notification.send.app_error"), user.Email, err) + l4g.Warn(utils.T("api.email_batchings.send_batched_email_notification.send.app_error"), user.Email, err) } } diff --git a/app/email_test.go b/app/email_test.go index 67457c702..449e81b75 100644 --- a/app/email_test.go +++ b/app/email_test.go @@ -70,7 +70,7 @@ func TestSendEmailChangeVerifyEmail(t *testing.T) { var newUserEmail string = "newtest@example.com" var locale string = "en" - var siteURL string = "" + var siteURL string = "http://localhost:8065" var expectedPartialMessage string = "You updated your email" var expectedSubject string = "[" + utils.Cfg.TeamSettings.SiteName + "] Verify new email address" var token string = "TEST_TOKEN" @@ -174,7 +174,7 @@ func TestSendVerifyEmail(t *testing.T) { var userEmail string = "test@example.com" var locale string = "en" - var siteURL string = "" + var siteURL string = "http://localhost:8605" var expectedPartialMessage string = "Please verify your email address by clicking below" var expectedSubject string = "[" + utils.Cfg.TeamSettings.SiteName + "] Email Verification" var token string = "TEST_TOKEN" |