diff options
author | Derrick Anderson <derrick@andersonwebstudio.com> | 2018-02-12 14:13:29 -0500 |
---|---|---|
committer | Derrick Anderson <derrick@andersonwebstudio.com> | 2018-02-12 14:13:29 -0500 |
commit | 3da5df3c90f5888a3490881957befabb37c308d5 (patch) | |
tree | a99a74d6b858d73624c06f85e393acbe97c90586 /api4/team_test.go | |
parent | 07fd7aeeb8eb2b198b01b713a4ab57f6352faef2 (diff) | |
parent | 1ae680aefae2deb1e9d07d7c2a1c863ec807a79f (diff) | |
download | chat-3da5df3c90f5888a3490881957befabb37c308d5.tar.gz chat-3da5df3c90f5888a3490881957befabb37c308d5.tar.bz2 chat-3da5df3c90f5888a3490881957befabb37c308d5.zip |
Merge remote-tracking branch 'origin/release-4.7' into release-4.7-t4merge
Diffstat (limited to 'api4/team_test.go')
-rw-r--r-- | api4/team_test.go | 3 |
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)) |