From c6cbce610043bb050f2c542412eb439dc22c4a88 Mon Sep 17 00:00:00 2001 From: Joram Wilander Date: Fri, 18 May 2018 09:13:23 -0400 Subject: Add config setting for API team deletion (#8800) --- api4/team_test.go | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) (limited to 'api4/team_test.go') diff --git a/api4/team_test.go b/api4/team_test.go index 705ff603b..bf67d8fde 100644 --- a/api4/team_test.go +++ b/api4/team_test.go @@ -540,22 +540,25 @@ func TestPermanentDeleteTeam(t *testing.T) { team := &model.Team{DisplayName: "DisplayName", Name: GenerateTestTeamName(), Email: th.GenerateTestEmail(), Type: model.TEAM_OPEN} team, _ = Client.CreateTeam(team) + th.App.UpdateConfig(func(cfg *model.Config) { *cfg.ServiceSettings.EnableAPITeamDeletion = false }) + + // Does not error when deletion is disabled, just soft deletes ok, resp := Client.PermanentDeleteTeam(team.Id) CheckNoError(t, resp) + assert.True(t, ok) - if !ok { - t.Fatal("should have returned true") - } - - // The team is deleted in the background, its only soft deleted at this - // time rteam, err := th.App.GetTeam(team.Id) - if err != nil { - t.Fatal("should have returned archived team") - } - if rteam.DeleteAt == 0 { - t.Fatal("should have not set to zero") - } + assert.Nil(t, err) + assert.True(t, rteam.DeleteAt > 0) + + th.App.UpdateConfig(func(cfg *model.Config) { *cfg.ServiceSettings.EnableAPITeamDeletion = true }) + + ok, resp = Client.PermanentDeleteTeam(team.Id) + CheckNoError(t, resp) + assert.True(t, ok) + + _, err = th.App.GetTeam(team.Id) + assert.NotNil(t, err) ok, resp = Client.PermanentDeleteTeam("junk") CheckBadRequestStatus(t, resp) -- cgit v1.2.3-1-g7c22