diff options
| author | cpanato <ctadeu@gmail.com> | 2018-07-12 19:50:16 +0200 |
|---|---|---|
| committer | cpanato <ctadeu@gmail.com> | 2018-07-12 19:50:16 +0200 |
| commit | adc56ae78df2a84c14c5e2921ec9cb14817a2474 (patch) | |
| tree | a66d4646ecc3baef4d365f7148fe3921ab267e15 /api4/team_test.go | |
| parent | 8cad7070acc537d070edd1029fe0c6ce422ab0ed (diff) | |
| parent | 2e861c4df4063f325df40861ee045c0136d34f1e (diff) | |
| download | chat-adc56ae78df2a84c14c5e2921ec9cb14817a2474.tar.gz chat-adc56ae78df2a84c14c5e2921ec9cb14817a2474.tar.bz2 chat-adc56ae78df2a84c14c5e2921ec9cb14817a2474.zip | |
Merge remote-tracking branch 'upstream/release-5.1' into release-5.1-daily-merge-20180712
Diffstat (limited to 'api4/team_test.go')
| -rw-r--r-- | api4/team_test.go | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/api4/team_test.go b/api4/team_test.go index 307e91635..fc49b794f 100644 --- a/api4/team_test.go +++ b/api4/team_test.go @@ -540,6 +540,11 @@ func TestPermanentDeleteTeam(t *testing.T) { team := &model.Team{DisplayName: "DisplayName", Name: GenerateTestTeamName(), Email: th.GenerateTestEmail(), Type: model.TEAM_OPEN} team, _ = Client.CreateTeam(team) + enableAPITeamDeletion := *th.App.Config().ServiceSettings.EnableAPITeamDeletion + defer func() { + th.App.UpdateConfig(func(cfg *model.Config) { cfg.ServiceSettings.EnableAPITeamDeletion = &enableAPITeamDeletion }) + }() + th.App.UpdateConfig(func(cfg *model.Config) { *cfg.ServiceSettings.EnableAPITeamDeletion = false }) // Does not error when deletion is disabled, just soft deletes @@ -1935,15 +1940,20 @@ func TestInviteUsersToTeam(t *testing.T) { utils.DeleteMailBox(user1) utils.DeleteMailBox(user2) - th.App.UpdateConfig(func(cfg *model.Config) { *cfg.ServiceSettings.EnableEmailInvitations = false }) + enableEmailInvitations := *th.App.Config().ServiceSettings.EnableEmailInvitations + restrictCreationToDomains := th.App.Config().TeamSettings.RestrictCreationToDomains + defer func() { + th.App.UpdateConfig(func(cfg *model.Config) { cfg.ServiceSettings.EnableEmailInvitations = &enableEmailInvitations }) + th.App.UpdateConfig(func(cfg *model.Config) { cfg.TeamSettings.RestrictCreationToDomains = restrictCreationToDomains }) + }() + th.App.UpdateConfig(func(cfg *model.Config) { *cfg.ServiceSettings.EnableEmailInvitations = false }) _, resp := th.SystemAdminClient.InviteUsersToTeam(th.BasicTeam.Id, emailList) if resp.Error == nil { t.Fatal("Should be disabled") } th.App.UpdateConfig(func(cfg *model.Config) { *cfg.ServiceSettings.EnableEmailInvitations = true }) - okMsg, resp := th.SystemAdminClient.InviteUsersToTeam(th.BasicTeam.Id, emailList) CheckNoError(t, resp) if !okMsg { |