summaryrefslogtreecommitdiffstats
path: root/api4
diff options
context:
space:
mode:
authorDerrick Anderson <derrick@andersonwebstudio.com>2018-02-12 14:50:52 -0500
committerDerrick Anderson <derrick@andersonwebstudio.com>2018-02-12 14:50:52 -0500
commitd88d2bc2ed3aefa68b5ed2942f493ae42bb40bfa (patch)
treea99a74d6b858d73624c06f85e393acbe97c90586 /api4
parent07fd7aeeb8eb2b198b01b713a4ab57f6352faef2 (diff)
parent3da5df3c90f5888a3490881957befabb37c308d5 (diff)
downloadchat-d88d2bc2ed3aefa68b5ed2942f493ae42bb40bfa.tar.gz
chat-d88d2bc2ed3aefa68b5ed2942f493ae42bb40bfa.tar.bz2
chat-d88d2bc2ed3aefa68b5ed2942f493ae42bb40bfa.zip
Merge branch 'release-4.7-t4merge'
Diffstat (limited to 'api4')
-rw-r--r--api4/team_test.go3
1 files changed, 2 insertions, 1 deletions
diff --git a/api4/team_test.go b/api4/team_test.go
index 56e6d575d..faa90e511 100644
--- a/api4/team_test.go
+++ b/api4/team_test.go
@@ -1244,7 +1244,7 @@ func TestAddTeamMember(t *testing.T) {
tm, resp := Client.AddTeamMember(team.Id, otherUser.Id)
CheckForbiddenStatus(t, resp)
if resp.Error == nil {
- t.Fatalf("Error is nhul")
+ t.Fatalf("Error is nil")
}
Client.Logout()
@@ -1343,6 +1343,7 @@ func TestAddTeamMember(t *testing.T) {
dataObject := make(map[string]string)
dataObject["time"] = fmt.Sprintf("%v", model.GetMillis())
dataObject["id"] = team.Id
+ dataObject["invite_id"] = team.InviteId
data := model.MapToJson(dataObject)
hashed := utils.HashSha256(fmt.Sprintf("%v:%v", data, th.App.Config().EmailSettings.InviteSalt))