From 7ed712f938588491da35b1d04b7f44700975c70b Mon Sep 17 00:00:00 2001 From: Carlos Tadeu Panato Junior Date: Wed, 11 Jul 2018 12:58:16 +0200 Subject: Restore config after finisht the test case (#9085) --- api4/team_test.go | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'api4/team_test.go') 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 { -- cgit v1.2.3-1-g7c22