diff options
| author | George Goldberg <george@gberg.me> | 2018-02-13 13:35:52 +0000 |
|---|---|---|
| committer | George Goldberg <george@gberg.me> | 2018-02-13 13:46:01 +0000 |
| commit | 5c101253c5987743cf1b3a8fe68814d748070622 (patch) | |
| tree | e2632505d051e7d15d6daf974ed8ac92095f82fe /api4/team_test.go | |
| parent | b7fc3d7d35ca4dd16097715a66463392a1dfaf0a (diff) | |
| parent | d88d2bc2ed3aefa68b5ed2942f493ae42bb40bfa (diff) | |
| download | chat-5c101253c5987743cf1b3a8fe68814d748070622.tar.gz chat-5c101253c5987743cf1b3a8fe68814d748070622.tar.bz2 chat-5c101253c5987743cf1b3a8fe68814d748070622.zip | |
Merge branch 'master' into advanced-permissions-phase-1
Diffstat (limited to 'api4/team_test.go')
| -rw-r--r-- | api4/team_test.go | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/api4/team_test.go b/api4/team_test.go index 272b7372e..fa139faae 100644 --- a/api4/team_test.go +++ b/api4/team_test.go @@ -1250,7 +1250,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() @@ -1339,6 +1339,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)) @@ -1862,10 +1863,6 @@ func TestInviteUsersToTeam(t *testing.T) { } } - restrictCreationToDomains := th.App.Config().TeamSettings.RestrictCreationToDomains - defer func() { - th.App.UpdateConfig(func(cfg *model.Config) { cfg.TeamSettings.RestrictCreationToDomains = restrictCreationToDomains }) - }() th.App.UpdateConfig(func(cfg *model.Config) { cfg.TeamSettings.RestrictCreationToDomains = "@example.com" }) err := th.App.InviteNewUsersToTeam(emailList, th.BasicTeam.Id, th.BasicUser.Id) |