diff options
author | Martin Kraft <martinkraft@gmail.com> | 2018-05-22 12:54:00 -0400 |
---|---|---|
committer | Martin Kraft <martinkraft@gmail.com> | 2018-05-22 12:54:00 -0400 |
commit | 4c683aff7627040ff811f065848a820b2cb19d59 (patch) | |
tree | 668061e8acfd8827fd02bab18a998b7986944296 /api4/team_test.go | |
parent | eb78d273f39202046fa71555a5a19b0ec8a95cb3 (diff) | |
parent | 1af1bce6199597bb2d41ddcdc00ef0f28a73c83e (diff) | |
download | chat-4c683aff7627040ff811f065848a820b2cb19d59.tar.gz chat-4c683aff7627040ff811f065848a820b2cb19d59.tar.bz2 chat-4c683aff7627040ff811f065848a820b2cb19d59.zip |
Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2
Diffstat (limited to 'api4/team_test.go')
-rw-r--r-- | api4/team_test.go | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/api4/team_test.go b/api4/team_test.go index f08aa6ba9..b47a8b650 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) |