PLT-5765 Passed SiteURL to SendNotifications (#5705)

Этот коммит содержится в:
Harrison Healey
2017-03-10 05:18:18 -05:00
коммит произвёл George Goldberg
родитель 43e5bbea37
Коммит a8e68bd890
35 изменённых файлов: 120 добавлений и 118 удалений

Просмотреть файл

@@ -8,6 +8,7 @@ import (
"testing"
"github.com/mattermost/platform/model"
"github.com/mattermost/platform/utils"
)
func TestCreateTeam(t *testing.T) {
@@ -42,12 +43,12 @@ func TestCreateTeamWithUser(t *testing.T) {
Type: model.TEAM_OPEN,
}
if _, err := CreateTeamWithUser(team, th.BasicUser.Id); err != nil {
if _, err := CreateTeamWithUser(team, th.BasicUser.Id, utils.GetSiteURL()); err != nil {
t.Log(err)
t.Fatal("Should create a new team with existing user")
}
if _, err := CreateTeamWithUser(team, model.NewId()); err == nil {
if _, err := CreateTeamWithUser(team, model.NewId(), utils.GetSiteURL()); err == nil {
t.Fatal("Should not create a new team - user does not exist")
}
@@ -63,7 +64,7 @@ func TestCreateTeamWithUser(t *testing.T) {
}
//Fail to create a team with user when user has set email without domain
if _, err := CreateTeamWithUser(team2, ruser.Id); err == nil {
if _, err := CreateTeamWithUser(team2, ruser.Id, utils.GetSiteURL()); err == nil {
t.Log(err.Message)
t.Fatal("Should not create a team with user when user has set email without domain")
} else {
@@ -95,7 +96,7 @@ func TestAddUserToTeam(t *testing.T) {
user := model.User{Email: strings.ToLower(model.NewId()) + "success+test@example.com", Nickname: "Darth Vader", Username: "vader" + model.NewId(), Password: "passwd1", AuthService: ""}
ruser, _ := CreateUser(&user)
if _, err := AddUserToTeam(th.BasicTeam.Id, ruser.Id); err != nil {
if _, err := AddUserToTeam(th.BasicTeam.Id, ruser.Id, utils.GetSiteURL()); err != nil {
t.Log(err)
t.Fatal("Should add user to the team")
}
@@ -107,7 +108,7 @@ func TestAddUserToTeamByTeamId(t *testing.T) {
user := model.User{Email: strings.ToLower(model.NewId()) + "success+test@example.com", Nickname: "Darth Vader", Username: "vader" + model.NewId(), Password: "passwd1", AuthService: ""}
ruser, _ := CreateUser(&user)
if err := AddUserToTeamByTeamId(th.BasicTeam.Id, ruser); err != nil {
if err := AddUserToTeamByTeamId(th.BasicTeam.Id, ruser, utils.GetSiteURL()); err != nil {
t.Log(err)
t.Fatal("Should add user to the team")
}