From 9bc7af0c5704bbf73f8240b4569d5ea215352e39 Mon Sep 17 00:00:00 2001 From: Chris Date: Mon, 2 Oct 2017 03:50:56 -0500 Subject: Don't use global app for api / api4 tests (#7528) * don't use global app for api / api4 tests * put sleep back. we're gonna have to do some goroutine wrangling * fix oauth test config assumptions * jobs package, i'm comin' for you next * app test fix * try increasing sleep a little --- api4/apitestlib.go | 60 ++++++++++++++----------------- api4/brand_test.go | 4 +-- api4/channel_test.go | 86 ++++++++++++++++++++++---------------------- api4/cluster_test.go | 1 + api4/command_help_test.go | 2 ++ api4/command_test.go | 14 ++++---- api4/elasticsearch_test.go | 4 +-- api4/emoji_test.go | 10 +++--- api4/file_test.go | 16 ++++----- api4/job_test.go | 10 +++--- api4/ldap_test.go | 4 +-- api4/oauth_test.go | 20 +++++------ api4/openGraph_test.go | 2 ++ api4/plugin_test.go | 2 +- api4/post_test.go | 40 ++++++++++----------- api4/preference_test.go | 12 ++++--- api4/reaction_test.go | 6 ++-- api4/saml_test.go | 2 +- api4/status_test.go | 6 ++-- api4/system_test.go | 35 ++++++++++-------- api4/team_test.go | 60 +++++++++++++++---------------- api4/user_test.go | 90 +++++++++++++++++++++++++--------------------- api4/webhook_test.go | 32 +++++++++-------- api4/webrtc_test.go | 2 +- api4/websocket_test.go | 11 +----- 25 files changed, 269 insertions(+), 262 deletions(-) (limited to 'api4') diff --git a/api4/apitestlib.go b/api4/apitestlib.go index 301e312da..f3c9c1634 100644 --- a/api4/apitestlib.go +++ b/api4/apitestlib.go @@ -5,6 +5,7 @@ package api4 import ( "bytes" + "fmt" "io" "net/http" "os" @@ -46,7 +47,7 @@ type TestHelper struct { func setupTestHelper(enterprise bool) *TestHelper { th := &TestHelper{ - App: app.Global(), + App: app.New(), } if th.App.Srv == nil { @@ -75,9 +76,7 @@ func setupTestHelper(enterprise bool) *TestHelper { utils.License().Features.SetDefaults() } - if th.App.Jobs.Store == nil { - th.App.Jobs.Store = th.App.Srv.Store - } + th.App.Jobs.Store = th.App.Srv.Store th.Client = th.CreateClient() th.SystemAdminClient = th.CreateClient() @@ -92,13 +91,7 @@ func Setup() *TestHelper { return setupTestHelper(false) } -func StopServer() { - if app.Global().Srv != nil { - app.Global().StopServer() - } -} - -func TearDown() { +func (me *TestHelper) TearDown() { utils.DisableDebugLogForTest() var wg sync.WaitGroup @@ -108,13 +101,13 @@ func TearDown() { defer wg.Done() options := map[string]bool{} options[store.USER_SEARCH_OPTION_NAMES_ONLY_NO_FULL_NAME] = true - if result := <-app.Global().Srv.Store.User().Search("", "fakeuser", options); result.Err != nil { + if result := <-me.App.Srv.Store.User().Search("", "fakeuser", options); result.Err != nil { l4g.Error("Error tearing down test users") } else { users := result.Data.([]*model.User) for _, u := range users { - if err := app.Global().PermanentDeleteUser(u); err != nil { + if err := me.App.PermanentDeleteUser(u); err != nil { l4g.Error(err.Error()) } } @@ -123,13 +116,13 @@ func TearDown() { go func() { defer wg.Done() - if result := <-app.Global().Srv.Store.Team().SearchByName("faketeam"); result.Err != nil { + if result := <-me.App.Srv.Store.Team().SearchByName("faketeam"); result.Err != nil { l4g.Error("Error tearing down test teams") } else { teams := result.Data.([]*model.Team) for _, t := range teams { - if err := app.Global().PermanentDeleteTeam(t); err != nil { + if err := me.App.PermanentDeleteTeam(t); err != nil { l4g.Error(err.Error()) } } @@ -138,14 +131,14 @@ func TearDown() { go func() { defer wg.Done() - if result := <-app.Global().Srv.Store.OAuth().GetApps(0, 1000); result.Err != nil { + if result := <-me.App.Srv.Store.OAuth().GetApps(0, 1000); result.Err != nil { l4g.Error("Error tearing down test oauth apps") } else { apps := result.Data.([]*model.OAuthApp) for _, a := range apps { if strings.HasPrefix(a.Name, "fakeoauthapp") { - <-app.Global().Srv.Store.OAuth().DeleteApp(a.Id) + <-me.App.Srv.Store.OAuth().DeleteApp(a.Id) } } } @@ -153,6 +146,8 @@ func TearDown() { wg.Wait() + me.App.Shutdown() + utils.EnableDebugLogForTest() } @@ -165,9 +160,9 @@ func (me *TestHelper) InitBasic() *TestHelper { me.BasicChannel2 = me.CreatePublicChannel() me.BasicPost = me.CreatePost() me.BasicUser = me.CreateUser() - LinkUserToTeam(me.BasicUser, me.BasicTeam) + me.LinkUserToTeam(me.BasicUser, me.BasicTeam) me.BasicUser2 = me.CreateUser() - LinkUserToTeam(me.BasicUser2, me.BasicTeam) + me.LinkUserToTeam(me.BasicUser2, me.BasicTeam) me.App.AddUserToChannel(me.BasicUser, me.BasicChannel) me.App.AddUserToChannel(me.BasicUser2, me.BasicChannel) me.App.AddUserToChannel(me.BasicUser, me.BasicChannel2) @@ -232,9 +227,10 @@ func (me *TestHelper) CreateUserWithClient(client *model.Client4) *model.User { } utils.DisableDebugLogForTest() - ruser, _ := client.CreateUser(user) + ruser, r := client.CreateUser(user) + fmt.Println(r) ruser.Password = "Password1" - VerifyUserEmail(ruser.Id) + store.Must(me.App.Srv.Store.User().VerifyEmail(ruser.Id)) utils.EnableDebugLogForTest() return ruser } @@ -379,10 +375,10 @@ func (me *TestHelper) UpdateActiveUser(user *model.User, active bool) { utils.EnableDebugLogForTest() } -func LinkUserToTeam(user *model.User, team *model.Team) { +func (me *TestHelper) LinkUserToTeam(user *model.User, team *model.Team) { utils.DisableDebugLogForTest() - err := app.Global().JoinUserToTeam(team, user, "") + err := me.App.JoinUserToTeam(team, user, "") if err != nil { l4g.Error(err.Error()) l4g.Close() @@ -417,10 +413,6 @@ func GenerateTestId() string { return model.NewId() } -func VerifyUserEmail(userId string) { - store.Must(app.Global().Srv.Store.User().VerifyEmail(userId)) -} - func CheckUserSanitization(t *testing.T, user *model.User) { if user.Password != "" { t.Fatal("password wasn't blank") @@ -683,13 +675,13 @@ func cleanupTestFile(info *model.FileInfo) error { return nil } -func MakeUserChannelAdmin(user *model.User, channel *model.Channel) { +func (me *TestHelper) MakeUserChannelAdmin(user *model.User, channel *model.Channel) { utils.DisableDebugLogForTest() - if cmr := <-app.Global().Srv.Store.Channel().GetMember(channel.Id, user.Id); cmr.Err == nil { + if cmr := <-me.App.Srv.Store.Channel().GetMember(channel.Id, user.Id); cmr.Err == nil { cm := cmr.Data.(*model.ChannelMember) cm.Roles = "channel_admin channel_user" - if sr := <-app.Global().Srv.Store.Channel().UpdateMember(cm); sr.Err != nil { + if sr := <-me.App.Srv.Store.Channel().UpdateMember(cm); sr.Err != nil { utils.EnableDebugLogForTest() panic(sr.Err) } @@ -701,11 +693,11 @@ func MakeUserChannelAdmin(user *model.User, channel *model.Channel) { utils.EnableDebugLogForTest() } -func UpdateUserToTeamAdmin(user *model.User, team *model.Team) { +func (me *TestHelper) UpdateUserToTeamAdmin(user *model.User, team *model.Team) { utils.DisableDebugLogForTest() tm := &model.TeamMember{TeamId: team.Id, UserId: user.Id, Roles: model.ROLE_TEAM_USER.Id + " " + model.ROLE_TEAM_ADMIN.Id} - if tmr := <-app.Global().Srv.Store.Team().UpdateMember(tm); tmr.Err != nil { + if tmr := <-me.App.Srv.Store.Team().UpdateMember(tm); tmr.Err != nil { utils.EnableDebugLogForTest() l4g.Error(tmr.Err.Error()) l4g.Close() @@ -715,11 +707,11 @@ func UpdateUserToTeamAdmin(user *model.User, team *model.Team) { utils.EnableDebugLogForTest() } -func UpdateUserToNonTeamAdmin(user *model.User, team *model.Team) { +func (me *TestHelper) UpdateUserToNonTeamAdmin(user *model.User, team *model.Team) { utils.DisableDebugLogForTest() tm := &model.TeamMember{TeamId: team.Id, UserId: user.Id, Roles: model.ROLE_TEAM_USER.Id} - if tmr := <-app.Global().Srv.Store.Team().UpdateMember(tm); tmr.Err != nil { + if tmr := <-me.App.Srv.Store.Team().UpdateMember(tm); tmr.Err != nil { utils.EnableDebugLogForTest() l4g.Error(tmr.Err.Error()) l4g.Close() diff --git a/api4/brand_test.go b/api4/brand_test.go index 6ecb41a83..11a3cbf38 100644 --- a/api4/brand_test.go +++ b/api4/brand_test.go @@ -10,7 +10,7 @@ import ( func TestGetBrandImage(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client _, resp := Client.GetBrandImage() @@ -26,7 +26,7 @@ func TestGetBrandImage(t *testing.T) { func TestUploadBrandImage(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client data, err := readTestFile("test.png") diff --git a/api4/channel_test.go b/api4/channel_test.go index 517d166dc..cda3b5ced 100644 --- a/api4/channel_test.go +++ b/api4/channel_test.go @@ -18,7 +18,7 @@ import ( func TestCreateChannel(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client team := th.BasicTeam @@ -189,7 +189,7 @@ func TestCreateChannel(t *testing.T) { func TestUpdateChannel(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client team := th.BasicTeam @@ -261,7 +261,7 @@ func TestUpdateChannel(t *testing.T) { func TestPatchChannel(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client patch := &model.ChannelPatch{ @@ -317,7 +317,7 @@ func TestPatchChannel(t *testing.T) { func TestCreateDirectChannel(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client user1 := th.BasicUser user2 := th.BasicUser2 @@ -369,7 +369,7 @@ func TestCreateDirectChannel(t *testing.T) { func TestCreateGroupChannel(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client user := th.BasicUser user2 := th.BasicUser2 @@ -441,7 +441,7 @@ func TestCreateGroupChannel(t *testing.T) { func TestGetChannel(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client channel, resp := Client.GetChannel(th.BasicChannel.Id, "") @@ -490,7 +490,7 @@ func TestGetChannel(t *testing.T) { func TestGetDeletedChannelsForTeam(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client team := th.BasicTeam @@ -537,7 +537,7 @@ func TestGetDeletedChannelsForTeam(t *testing.T) { func TestGetPublicChannelsForTeam(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client team := th.BasicTeam publicChannel1 := th.BasicChannel @@ -617,7 +617,7 @@ func TestGetPublicChannelsForTeam(t *testing.T) { func TestGetPublicChannelsByIdsForTeam(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client teamId := th.BasicTeam.Id input := []string{th.BasicChannel.Id} @@ -679,7 +679,7 @@ func TestGetPublicChannelsByIdsForTeam(t *testing.T) { func TestGetChannelsForTeamForUser(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client channels, resp := Client.GetChannelsForTeamForUser(th.BasicTeam.Id, th.BasicUser.Id, "") @@ -727,7 +727,7 @@ func TestGetChannelsForTeamForUser(t *testing.T) { func TestSearchChannels(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client search := &model.ChannelSearch{Term: th.BasicChannel.Name} @@ -782,7 +782,7 @@ func TestSearchChannels(t *testing.T) { func TestDeleteChannel(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client team := th.BasicTeam user := th.BasicUser @@ -876,7 +876,7 @@ func TestDeleteChannel(t *testing.T) { _, resp = th.SystemAdminClient.DeleteChannel(publicChannel5.Id) CheckNoError(t, resp) - th = Setup().InitBasic().InitSystemAdmin() + th.InitBasic().InitSystemAdmin() isLicensed := utils.IsLicensed() license := utils.License() @@ -934,8 +934,8 @@ func TestDeleteChannel(t *testing.T) { CheckForbiddenStatus(t, resp) // successful delete by channel admin - MakeUserChannelAdmin(user, publicChannel6) - MakeUserChannelAdmin(user, privateChannel7) + th.MakeUserChannelAdmin(user, publicChannel6) + th.MakeUserChannelAdmin(user, privateChannel7) sqlstore.ClearChannelCaches() _, resp = Client.DeleteChannel(publicChannel6.Id) @@ -952,7 +952,7 @@ func TestDeleteChannel(t *testing.T) { th.App.AddUserToChannel(user2, privateChannel7) // successful delete by team admin - UpdateUserToTeamAdmin(user, team) + th.UpdateUserToTeamAdmin(user, team) th.App.InvalidateAllCaches() utils.SetIsLicensed(true) utils.SetLicense(&model.License{Features: &model.Features{}}) @@ -967,7 +967,7 @@ func TestDeleteChannel(t *testing.T) { *utils.Cfg.TeamSettings.RestrictPublicChannelDeletion = model.PERMISSIONS_TEAM_ADMIN *utils.Cfg.TeamSettings.RestrictPrivateChannelDeletion = model.PERMISSIONS_TEAM_ADMIN utils.SetDefaultRolesBasedOnConfig() - UpdateUserToNonTeamAdmin(user, team) + th.UpdateUserToNonTeamAdmin(user, team) th.App.InvalidateAllCaches() utils.SetIsLicensed(true) utils.SetLicense(&model.License{Features: &model.Features{}}) @@ -988,8 +988,8 @@ func TestDeleteChannel(t *testing.T) { CheckForbiddenStatus(t, resp) // // cannot delete by channel admin - MakeUserChannelAdmin(user, publicChannel6) - MakeUserChannelAdmin(user, privateChannel7) + th.MakeUserChannelAdmin(user, publicChannel6) + th.MakeUserChannelAdmin(user, privateChannel7) sqlstore.ClearChannelCaches() _, resp = Client.DeleteChannel(publicChannel6.Id) @@ -999,7 +999,7 @@ func TestDeleteChannel(t *testing.T) { CheckForbiddenStatus(t, resp) // successful delete by team admin - UpdateUserToTeamAdmin(th.BasicUser, team) + th.UpdateUserToTeamAdmin(th.BasicUser, team) th.App.InvalidateAllCaches() utils.SetIsLicensed(true) utils.SetLicense(&model.License{Features: &model.Features{}}) @@ -1030,8 +1030,8 @@ func TestDeleteChannel(t *testing.T) { CheckForbiddenStatus(t, resp) // cannot delete by channel admin - MakeUserChannelAdmin(user, publicChannel6) - MakeUserChannelAdmin(user, privateChannel7) + th.MakeUserChannelAdmin(user, publicChannel6) + th.MakeUserChannelAdmin(user, privateChannel7) sqlstore.ClearChannelCaches() _, resp = Client.DeleteChannel(publicChannel6.Id) @@ -1041,7 +1041,7 @@ func TestDeleteChannel(t *testing.T) { CheckForbiddenStatus(t, resp) // cannot delete by team admin - UpdateUserToTeamAdmin(th.BasicUser, team) + th.UpdateUserToTeamAdmin(th.BasicUser, team) th.App.InvalidateAllCaches() utils.SetIsLicensed(true) utils.SetLicense(&model.License{Features: &model.Features{}}) @@ -1073,7 +1073,7 @@ func TestDeleteChannel(t *testing.T) { func TestRestoreChannel(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client publicChannel1 := th.CreatePublicChannel() @@ -1099,7 +1099,7 @@ func TestRestoreChannel(t *testing.T) { func TestGetChannelByName(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client channel, resp := Client.GetChannelByName(th.BasicChannel.Name, th.BasicTeam.Id, "") @@ -1145,7 +1145,7 @@ func TestGetChannelByName(t *testing.T) { func TestGetChannelByNameForTeamName(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client channel, resp := th.SystemAdminClient.GetChannelByNameForTeamName(th.BasicChannel.Name, th.BasicTeam.Name, "") @@ -1176,7 +1176,7 @@ func TestGetChannelByNameForTeamName(t *testing.T) { func TestGetChannelMembers(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client members, resp := Client.GetChannelMembers(th.BasicChannel.Id, 0, 60, "") @@ -1231,7 +1231,7 @@ func TestGetChannelMembers(t *testing.T) { func TestGetChannelMembersByIds(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client cm, resp := Client.GetChannelMembersByIds(th.BasicChannel.Id, []string{th.BasicUser.Id}) @@ -1278,7 +1278,7 @@ func TestGetChannelMembersByIds(t *testing.T) { func TestGetChannelMember(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client member, resp := Client.GetChannelMember(th.BasicChannel.Id, th.BasicUser.Id, "") @@ -1325,7 +1325,7 @@ func TestGetChannelMember(t *testing.T) { func TestGetChannelMembersForUser(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client members, resp := Client.GetChannelMembersForUser(th.BasicUser.Id, th.BasicTeam.Id, "") @@ -1368,7 +1368,7 @@ func TestGetChannelMembersForUser(t *testing.T) { func TestViewChannel(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client view := &model.ChannelView{ @@ -1439,7 +1439,7 @@ func TestViewChannel(t *testing.T) { func TestGetChannelUnread(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client user := th.BasicUser channel := th.BasicChannel @@ -1483,7 +1483,7 @@ func TestGetChannelUnread(t *testing.T) { func TestGetChannelStats(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client channel := th.CreatePrivateChannel() @@ -1517,7 +1517,7 @@ func TestGetChannelStats(t *testing.T) { func TestGetPinnedPosts(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client channel := th.BasicChannel @@ -1556,7 +1556,7 @@ func TestGetPinnedPosts(t *testing.T) { func TestUpdateChannelRoles(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client const CHANNEL_ADMIN = "channel_admin channel_user" @@ -1635,7 +1635,7 @@ func TestUpdateChannelRoles(t *testing.T) { func TestUpdateChannelNotifyProps(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client props := map[string]string{} @@ -1685,7 +1685,7 @@ func TestUpdateChannelNotifyProps(t *testing.T) { func TestAddChannelMember(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client user := th.BasicUser user2 := th.BasicUser2 @@ -1843,7 +1843,7 @@ func TestAddChannelMember(t *testing.T) { CheckForbiddenStatus(t, resp) Client.Logout() - MakeUserChannelAdmin(user, privateChannel) + th.MakeUserChannelAdmin(user, privateChannel) th.App.InvalidateAllCaches() utils.SetIsLicensed(true) utils.SetLicense(&model.License{Features: &model.Features{}}) @@ -1873,7 +1873,7 @@ func TestAddChannelMember(t *testing.T) { CheckForbiddenStatus(t, resp) Client.Logout() - UpdateUserToTeamAdmin(user, team) + th.UpdateUserToTeamAdmin(user, team) th.App.InvalidateAllCaches() utils.SetIsLicensed(true) utils.SetLicense(&model.License{Features: &model.Features{}}) @@ -1912,7 +1912,7 @@ func TestRemoveChannelMember(t *testing.T) { user1 := th.BasicUser user2 := th.BasicUser2 team := th.BasicTeam - defer TearDown() + defer th.TearDown() Client := th.Client pass, resp := Client.RemoveUserFromChannel(th.BasicChannel.Id, th.BasicUser2.Id) @@ -1963,7 +1963,7 @@ func TestRemoveChannelMember(t *testing.T) { CheckNoError(t, resp) th.LoginBasic() - UpdateUserToNonTeamAdmin(user1, team) + th.UpdateUserToNonTeamAdmin(user1, team) th.App.InvalidateAllCaches() // Test policy does not apply to TE. @@ -2023,7 +2023,7 @@ func TestRemoveChannelMember(t *testing.T) { _, resp = Client.RemoveUserFromChannel(privateChannel.Id, user2.Id) CheckForbiddenStatus(t, resp) - MakeUserChannelAdmin(user1, privateChannel) + th.MakeUserChannelAdmin(user1, privateChannel) th.App.InvalidateAllCaches() utils.SetIsLicensed(true) utils.SetLicense(&model.License{Features: &model.Features{}}) @@ -2048,7 +2048,7 @@ func TestRemoveChannelMember(t *testing.T) { _, resp = Client.RemoveUserFromChannel(privateChannel.Id, user2.Id) CheckForbiddenStatus(t, resp) - UpdateUserToTeamAdmin(user1, team) + th.UpdateUserToTeamAdmin(user1, team) th.App.InvalidateAllCaches() utils.SetIsLicensed(true) utils.SetLicense(&model.License{Features: &model.Features{}}) diff --git a/api4/cluster_test.go b/api4/cluster_test.go index 573e309a4..8a0ffd1c4 100644 --- a/api4/cluster_test.go +++ b/api4/cluster_test.go @@ -9,6 +9,7 @@ import ( func TestGetClusterStatus(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() + defer th.TearDown() _, resp := th.Client.GetClusterStatus() CheckForbiddenStatus(t, resp) diff --git a/api4/command_help_test.go b/api4/command_help_test.go index 2328d8ef2..68a098636 100644 --- a/api4/command_help_test.go +++ b/api4/command_help_test.go @@ -12,6 +12,8 @@ import ( func TestHelpCommand(t *testing.T) { th := Setup().InitBasic() + defer th.TearDown() + Client := th.Client channel := th.BasicChannel diff --git a/api4/command_test.go b/api4/command_test.go index 6ef0f4d27..705ea8548 100644 --- a/api4/command_test.go +++ b/api4/command_test.go @@ -13,7 +13,7 @@ import ( func TestCreateCommand(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client enableCommands := *utils.Cfg.ServiceSettings.EnableCommands @@ -62,7 +62,7 @@ func TestCreateCommand(t *testing.T) { func TestUpdateCommand(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.SystemAdminClient user := th.SystemAdminUser team := th.BasicTeam @@ -148,7 +148,7 @@ func TestUpdateCommand(t *testing.T) { func TestDeleteCommand(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.SystemAdminClient user := th.SystemAdminUser team := th.BasicTeam @@ -211,7 +211,7 @@ func TestDeleteCommand(t *testing.T) { func TestListCommands(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client newCmd := &model.Command{ @@ -288,7 +288,7 @@ func TestListCommands(t *testing.T) { func TestListAutocompleteCommands(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client newCmd := &model.Command{ @@ -348,7 +348,7 @@ func TestListAutocompleteCommands(t *testing.T) { func TestRegenToken(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client enableCommands := *utils.Cfg.ServiceSettings.EnableCommands @@ -383,7 +383,7 @@ func TestRegenToken(t *testing.T) { func TestExecuteCommand(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client channel := th.BasicChannel diff --git a/api4/elasticsearch_test.go b/api4/elasticsearch_test.go index 768a73ad7..5aae5ebcd 100644 --- a/api4/elasticsearch_test.go +++ b/api4/elasticsearch_test.go @@ -9,7 +9,7 @@ import ( func TestElasticsearchTest(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() _, resp := th.Client.TestElasticsearch() CheckForbiddenStatus(t, resp) @@ -20,7 +20,7 @@ func TestElasticsearchTest(t *testing.T) { func TestElasticsearchPurgeIndexes(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() _, resp := th.Client.PurgeElasticsearchIndexes() CheckForbiddenStatus(t, resp) diff --git a/api4/emoji_test.go b/api4/emoji_test.go index 1aad6d2ec..fe746f304 100644 --- a/api4/emoji_test.go +++ b/api4/emoji_test.go @@ -15,7 +15,7 @@ import ( func TestCreateEmoji(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client EnableCustomEmoji := *utils.Cfg.ServiceSettings.EnableCustomEmoji @@ -143,7 +143,7 @@ func TestCreateEmoji(t *testing.T) { func TestGetEmojiList(t *testing.T) { th := Setup().InitBasic() - defer TearDown() + defer th.TearDown() Client := th.Client EnableCustomEmoji := *utils.Cfg.ServiceSettings.EnableCustomEmoji @@ -213,7 +213,7 @@ func TestGetEmojiList(t *testing.T) { func TestDeleteEmoji(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client EnableCustomEmoji := *utils.Cfg.ServiceSettings.EnableCustomEmoji @@ -280,7 +280,7 @@ func TestDeleteEmoji(t *testing.T) { func TestGetEmoji(t *testing.T) { th := Setup().InitBasic() - defer TearDown() + defer th.TearDown() Client := th.Client EnableCustomEmoji := *utils.Cfg.ServiceSettings.EnableCustomEmoji @@ -309,7 +309,7 @@ func TestGetEmoji(t *testing.T) { func TestGetEmojiImage(t *testing.T) { th := Setup().InitBasic() - defer TearDown() + defer th.TearDown() Client := th.Client EnableCustomEmoji := *utils.Cfg.ServiceSettings.EnableCustomEmoji diff --git a/api4/file_test.go b/api4/file_test.go index 95acb114c..584625f70 100644 --- a/api4/file_test.go +++ b/api4/file_test.go @@ -18,7 +18,7 @@ import ( func TestUploadFile(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client user := th.BasicUser @@ -120,7 +120,7 @@ func TestUploadFile(t *testing.T) { func TestGetFile(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client channel := th.BasicChannel @@ -169,7 +169,7 @@ func TestGetFile(t *testing.T) { func TestGetFileHeaders(t *testing.T) { th := Setup().InitBasic() - defer TearDown() + defer th.TearDown() Client := th.Client channel := th.BasicChannel @@ -234,7 +234,7 @@ func TestGetFileHeaders(t *testing.T) { func TestGetFileThumbnail(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client channel := th.BasicChannel @@ -286,7 +286,7 @@ func TestGetFileThumbnail(t *testing.T) { func TestGetFileLink(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client channel := th.BasicChannel @@ -361,7 +361,7 @@ func TestGetFileLink(t *testing.T) { func TestGetFilePreview(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client channel := th.BasicChannel @@ -413,7 +413,7 @@ func TestGetFilePreview(t *testing.T) { func TestGetFileInfo(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client user := th.BasicUser channel := th.BasicChannel @@ -480,7 +480,7 @@ func TestGetFileInfo(t *testing.T) { func TestGetPublicFile(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client channel := th.BasicChannel diff --git a/api4/job_test.go b/api4/job_test.go index 9ccde42dc..e2b261d44 100644 --- a/api4/job_test.go +++ b/api4/job_test.go @@ -13,7 +13,7 @@ import ( func TestCreateJob(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() job := &model.Job{ Type: model.JOB_TYPE_DATA_RETENTION, @@ -40,7 +40,7 @@ func TestCreateJob(t *testing.T) { func TestGetJob(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() job := &model.Job{ Id: model.NewId(), @@ -71,7 +71,7 @@ func TestGetJob(t *testing.T) { func TestGetJobs(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() jobType := model.NewId() @@ -122,7 +122,7 @@ func TestGetJobs(t *testing.T) { func TestGetJobsByType(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() jobType := model.NewId() @@ -186,7 +186,7 @@ func TestGetJobsByType(t *testing.T) { func TestCancelJob(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() jobs := []*model.Job{ { diff --git a/api4/ldap_test.go b/api4/ldap_test.go index 6d79a92ad..d259bbb4a 100644 --- a/api4/ldap_test.go +++ b/api4/ldap_test.go @@ -9,7 +9,7 @@ import ( func TestLdapTest(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() _, resp := th.Client.TestLdap() CheckForbiddenStatus(t, resp) @@ -20,7 +20,7 @@ func TestLdapTest(t *testing.T) { func TestLdapSync(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() _, resp := th.SystemAdminClient.SyncLdap() CheckNoError(t, resp) diff --git a/api4/oauth_test.go b/api4/oauth_test.go index 33ed1ac55..9fa794e27 100644 --- a/api4/oauth_test.go +++ b/api4/oauth_test.go @@ -15,7 +15,7 @@ import ( func TestCreateOAuthApp(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client AdminClient := th.SystemAdminClient @@ -83,7 +83,7 @@ func TestCreateOAuthApp(t *testing.T) { func TestUpdateOAuthApp(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client AdminClient := th.SystemAdminClient @@ -189,7 +189,7 @@ func TestUpdateOAuthApp(t *testing.T) { func TestGetOAuthApps(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client AdminClient := th.SystemAdminClient @@ -262,7 +262,7 @@ func TestGetOAuthApps(t *testing.T) { func TestGetOAuthApp(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client AdminClient := th.SystemAdminClient @@ -337,7 +337,7 @@ func TestGetOAuthApp(t *testing.T) { func TestGetOAuthAppInfo(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client AdminClient := th.SystemAdminClient @@ -412,7 +412,7 @@ func TestGetOAuthAppInfo(t *testing.T) { func TestDeleteOAuthApp(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client AdminClient := th.SystemAdminClient @@ -480,7 +480,7 @@ func TestDeleteOAuthApp(t *testing.T) { func TestRegenerateOAuthAppSecret(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client AdminClient := th.SystemAdminClient @@ -552,7 +552,7 @@ func TestRegenerateOAuthAppSecret(t *testing.T) { func TestGetAuthorizedOAuthAppsForUser(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client AdminClient := th.SystemAdminClient @@ -612,7 +612,7 @@ func TestGetAuthorizedOAuthAppsForUser(t *testing.T) { func TestAuthorizeOAuthApp(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client AdminClient := th.SystemAdminClient @@ -680,7 +680,7 @@ func TestAuthorizeOAuthApp(t *testing.T) { func TestDeauthorizeOAuthApp(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client AdminClient := th.SystemAdminClient diff --git a/api4/openGraph_test.go b/api4/openGraph_test.go index 5c4332745..04f207f55 100644 --- a/api4/openGraph_test.go +++ b/api4/openGraph_test.go @@ -16,6 +16,8 @@ import ( func TestGetOpenGraphMetadata(t *testing.T) { th := Setup().InitBasic() + defer th.TearDown() + Client := th.Client enableLinkPreviews := *utils.Cfg.ServiceSettings.EnableLinkPreviews diff --git a/api4/plugin_test.go b/api4/plugin_test.go index 9cedccfe7..5051ab434 100644 --- a/api4/plugin_test.go +++ b/api4/plugin_test.go @@ -24,7 +24,7 @@ func TestPlugin(t *testing.T) { defer os.RemoveAll(webappDir) th := SetupEnterprise().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() enablePlugins := *utils.Cfg.PluginSettings.Enable defer func() { diff --git a/api4/post_test.go b/api4/post_test.go index cce75e39b..fd6f8031d 100644 --- a/api4/post_test.go +++ b/api4/post_test.go @@ -21,7 +21,7 @@ import ( func TestCreatePost(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client post := &model.Post{ChannelId: th.BasicChannel.Id, Message: "#hashtag a" + model.NewId() + "a"} @@ -112,7 +112,7 @@ func testCreatePostWithOutgoingHook( triggerWhen int, ) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() user := th.SystemAdminUser team := th.BasicTeam channel := th.BasicChannel @@ -262,7 +262,7 @@ func TestCreatePostWithOutgoingHook_no_content_type(t *testing.T) { func TestCreatePostPublic(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client post := &model.Post{ChannelId: th.BasicChannel.Id, Message: "#hashtag a" + model.NewId() + "a"} @@ -307,7 +307,7 @@ func TestCreatePostPublic(t *testing.T) { func TestCreatePostAll(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client post := &model.Post{ChannelId: th.BasicChannel.Id, Message: "#hashtag a" + model.NewId() + "a"} @@ -362,7 +362,7 @@ func TestCreatePostAll(t *testing.T) { func TestUpdatePost(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client channel := th.BasicChannel @@ -441,7 +441,7 @@ func TestUpdatePost(t *testing.T) { func TestPatchPost(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client channel := th.BasicChannel @@ -546,7 +546,7 @@ func TestPatchPost(t *testing.T) { func TestPinPost(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client post := th.BasicPost @@ -581,7 +581,7 @@ func TestPinPost(t *testing.T) { func TestUnpinPost(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client pinnedPost := th.CreatePinnedPost() @@ -616,7 +616,7 @@ func TestUnpinPost(t *testing.T) { func TestGetPostsForChannel(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client post1 := th.CreatePost() @@ -728,7 +728,7 @@ func TestGetPostsForChannel(t *testing.T) { func TestGetFlaggedPostsForUser(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client user := th.BasicUser team1 := th.BasicTeam @@ -909,7 +909,7 @@ func TestGetFlaggedPostsForUser(t *testing.T) { func TestGetPostsAfterAndBefore(t *testing.T) { th := Setup().InitBasic() - defer TearDown() + defer th.TearDown() Client := th.Client post1 := th.CreatePost() @@ -993,7 +993,7 @@ func TestGetPostsAfterAndBefore(t *testing.T) { func TestGetPost(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client post, resp := Client.GetPost(th.BasicPost.Id, "") @@ -1042,7 +1042,7 @@ func TestGetPost(t *testing.T) { func TestDeletePost(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client _, resp := Client.DeletePost("") @@ -1080,7 +1080,7 @@ func TestDeletePost(t *testing.T) { func TestGetPostThread(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client post := &model.Post{ChannelId: th.BasicChannel.Id, Message: "zz" + model.NewId() + "a", RootId: th.BasicPost.Id} @@ -1138,7 +1138,7 @@ func TestGetPostThread(t *testing.T) { func TestSearchPosts(t *testing.T) { th := Setup().InitBasic() - defer TearDown() + defer th.TearDown() th.LoginBasic() Client := th.Client @@ -1199,7 +1199,7 @@ func TestSearchPosts(t *testing.T) { func TestSearchHashtagPosts(t *testing.T) { th := Setup().InitBasic() - defer TearDown() + defer th.TearDown() th.LoginBasic() Client := th.Client @@ -1225,7 +1225,7 @@ func TestSearchHashtagPosts(t *testing.T) { func TestSearchPostsInChannel(t *testing.T) { th := Setup().InitBasic() - defer TearDown() + defer th.TearDown() th.LoginBasic() Client := th.Client @@ -1291,12 +1291,12 @@ func TestSearchPostsInChannel(t *testing.T) { func TestSearchPostsFromUser(t *testing.T) { th := Setup().InitBasic() - defer TearDown() + defer th.TearDown() Client := th.Client th.LoginTeamAdmin() user := th.CreateUser() - LinkUserToTeam(user, th.BasicTeam) + th.LinkUserToTeam(user, th.BasicTeam) th.App.AddUserToChannel(user, th.BasicChannel) th.App.AddUserToChannel(user, th.BasicChannel2) @@ -1355,7 +1355,7 @@ func TestSearchPostsFromUser(t *testing.T) { func TestGetFileInfosForPost(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client fileIds := make([]string, 3, 3) diff --git a/api4/preference_test.go b/api4/preference_test.go index 7eded5035..4a68bc804 100644 --- a/api4/preference_test.go +++ b/api4/preference_test.go @@ -13,7 +13,7 @@ import ( func TestGetPreferences(t *testing.T) { th := Setup().InitBasic() - defer TearDown() + defer th.TearDown() Client := th.Client th.LoginBasic() @@ -71,7 +71,7 @@ func TestGetPreferences(t *testing.T) { func TestGetPreferencesByCategory(t *testing.T) { th := Setup().InitBasic() - defer TearDown() + defer th.TearDown() Client := th.Client th.LoginBasic() @@ -130,7 +130,7 @@ func TestGetPreferencesByCategory(t *testing.T) { func TestGetPreferenceByCategoryAndName(t *testing.T) { th := Setup().InitBasic() - defer TearDown() + defer th.TearDown() Client := th.Client th.LoginBasic() @@ -185,7 +185,7 @@ func TestGetPreferenceByCategoryAndName(t *testing.T) { func TestUpdatePreferences(t *testing.T) { th := Setup().InitBasic() - defer TearDown() + defer th.TearDown() Client := th.Client th.LoginBasic() @@ -244,6 +244,7 @@ func TestUpdatePreferences(t *testing.T) { func TestUpdatePreferencesWebsocket(t *testing.T) { th := Setup().InitBasic() + defer th.TearDown() WebSocketClient, err := th.CreateWebSocketClient() if err != nil { @@ -299,7 +300,7 @@ func TestUpdatePreferencesWebsocket(t *testing.T) { func TestDeletePreferences(t *testing.T) { th := Setup().InitBasic() - defer TearDown() + defer th.TearDown() Client := th.Client th.LoginBasic() @@ -346,6 +347,7 @@ func TestDeletePreferences(t *testing.T) { func TestDeletePreferencesWebsocket(t *testing.T) { th := Setup().InitBasic() + defer th.TearDown() userId := th.BasicUser.Id preferences := &model.Preferences{ diff --git a/api4/reaction_test.go b/api4/reaction_test.go index 75f0cded0..b64d42ce3 100644 --- a/api4/reaction_test.go +++ b/api4/reaction_test.go @@ -14,7 +14,7 @@ import ( func TestSaveReaction(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client userId := th.BasicUser.Id postId := th.BasicPost.Id @@ -133,7 +133,7 @@ func TestSaveReaction(t *testing.T) { func TestGetReactions(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client userId := th.BasicUser.Id user2Id := th.BasicUser2.Id @@ -209,7 +209,7 @@ func TestGetReactions(t *testing.T) { func TestDeleteReaction(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client userId := th.BasicUser.Id user2Id := th.BasicUser2.Id diff --git a/api4/saml_test.go b/api4/saml_test.go index 0e16612d7..ef0dfb8cb 100644 --- a/api4/saml_test.go +++ b/api4/saml_test.go @@ -9,7 +9,7 @@ import ( func TestGetSamlMetadata(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client _, resp := Client.GetSamlMetadata() diff --git a/api4/status_test.go b/api4/status_test.go index 7cb4fb821..963537e76 100644 --- a/api4/status_test.go +++ b/api4/status_test.go @@ -8,7 +8,7 @@ import ( func TestGetUserStatus(t *testing.T) { th := Setup().InitBasic() - defer TearDown() + defer th.TearDown() Client := th.Client userStatus, resp := Client.GetUserStatus(th.BasicUser.Id, "") @@ -60,7 +60,7 @@ func TestGetUserStatus(t *testing.T) { func TestGetUsersStatusesByIds(t *testing.T) { th := Setup().InitBasic() - defer TearDown() + defer th.TearDown() Client := th.Client usersIds := []string{th.BasicUser.Id, th.BasicUser2.Id} @@ -101,7 +101,7 @@ func TestGetUsersStatusesByIds(t *testing.T) { func TestUpdateUserStatus(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client toUpdateUserStatus := &model.Status{Status: "online"} diff --git a/api4/system_test.go b/api4/system_test.go index 426752b58..76dac5316 100644 --- a/api4/system_test.go +++ b/api4/system_test.go @@ -6,13 +6,18 @@ import ( "testing" l4g "github.com/alecthomas/log4go" + "github.com/mattermost/mattermost-server/app" "github.com/mattermost/mattermost-server/model" "github.com/mattermost/mattermost-server/utils" ) +func init() { + app.UseGlobalApp = false +} + func TestGetPing(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client goRoutineHealthThreshold := *utils.Cfg.ServiceSettings.GoroutineHealthThreshold @@ -36,7 +41,7 @@ func TestGetPing(t *testing.T) { func TestGetConfig(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client _, resp := Client.GetConfig() @@ -83,7 +88,7 @@ func TestGetConfig(t *testing.T) { func TestReloadConfig(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client flag, resp := Client.ReloadConfig() @@ -104,7 +109,7 @@ func TestReloadConfig(t *testing.T) { func TestUpdateConfig(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client cfg := th.App.GetConfig() @@ -144,7 +149,7 @@ func TestUpdateConfig(t *testing.T) { func TestGetOldClientConfig(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client config, resp := Client.GetOldClientConfig("") @@ -170,7 +175,7 @@ func TestGetOldClientConfig(t *testing.T) { func TestGetOldClientLicense(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client license, resp := Client.GetOldClientLicense("") @@ -203,7 +208,7 @@ func TestGetOldClientLicense(t *testing.T) { func TestGetAudits(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client audits, resp := th.SystemAdminClient.GetAudits(0, 100, "") @@ -240,7 +245,7 @@ func TestGetAudits(t *testing.T) { func TestEmailTest(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client SendEmailNotifications := utils.Cfg.EmailSettings.SendEmailNotifications @@ -269,7 +274,7 @@ func TestEmailTest(t *testing.T) { func TestDatabaseRecycle(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client _, resp := Client.DatabaseRecycle() @@ -281,7 +286,7 @@ func TestDatabaseRecycle(t *testing.T) { func TestInvalidateCaches(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client flag, resp := Client.InvalidateCaches() @@ -299,7 +304,7 @@ func TestInvalidateCaches(t *testing.T) { func TestGetLogs(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client for i := 0; i < 20; i++ { @@ -339,7 +344,7 @@ func TestGetLogs(t *testing.T) { func TestPostLog(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client message := make(map[string]string) @@ -358,7 +363,7 @@ func TestPostLog(t *testing.T) { func TestUploadLicenseFile(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client ok, resp := Client.UploadLicenseFile([]byte{}) @@ -376,7 +381,7 @@ func TestUploadLicenseFile(t *testing.T) { func TestRemoveLicenseFile(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client ok, resp := Client.RemoveLicenseFile() @@ -394,7 +399,7 @@ func TestRemoveLicenseFile(t *testing.T) { func TestGetAnalyticsOld(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client rows, resp := Client.GetAnalyticsOld("", "") diff --git a/api4/team_test.go b/api4/team_test.go index 35589f4e8..bd42682bf 100644 --- a/api4/team_test.go +++ b/api4/team_test.go @@ -20,7 +20,7 @@ import ( func TestCreateTeam(t *testing.T) { th := Setup().InitBasic() - defer TearDown() + defer th.TearDown() Client := th.Client team := &model.Team{Name: GenerateTestUsername(), DisplayName: "Some Team", Type: model.TEAM_OPEN} @@ -84,7 +84,7 @@ func TestCreateTeam(t *testing.T) { func TestGetTeam(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client team := th.BasicTeam @@ -131,7 +131,7 @@ func TestGetTeam(t *testing.T) { func TestGetTeamUnread(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client teamUnread, resp := Client.GetTeamUnread(th.BasicTeam.Id, th.BasicUser.Id) @@ -165,7 +165,7 @@ func TestGetTeamUnread(t *testing.T) { func TestUpdateTeam(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client team := &model.Team{DisplayName: "Name", Description: "Some description", AllowOpenInvite: false, InviteId: "inviteid0", Name: "z-z-" + model.NewId() + "a", Email: "success+" + model.NewId() + "@simulator.amazonses.com", Type: model.TEAM_OPEN} @@ -263,7 +263,7 @@ func TestUpdateTeam(t *testing.T) { func TestPatchTeam(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client team := &model.Team{DisplayName: "Name", Description: "Some description", CompanyName: "Some company name", AllowOpenInvite: false, InviteId: "inviteid0", Name: "z-z-" + model.NewId() + "a", Email: "success+" + model.NewId() + "@simulator.amazonses.com", Type: model.TEAM_OPEN} @@ -332,7 +332,7 @@ func TestPatchTeam(t *testing.T) { func TestSoftDeleteTeam(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client team := &model.Team{DisplayName: "DisplayName", Name: GenerateTestTeamName(), Email: GenerateTestEmail(), Type: model.TEAM_OPEN} @@ -374,7 +374,7 @@ func TestSoftDeleteTeam(t *testing.T) { func TestPermanentDeleteTeam(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client team := &model.Team{DisplayName: "DisplayName", Name: GenerateTestTeamName(), Email: GenerateTestEmail(), Type: model.TEAM_OPEN} @@ -407,7 +407,7 @@ func TestPermanentDeleteTeam(t *testing.T) { func TestGetAllTeams(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client team := &model.Team{DisplayName: "Name", Name: GenerateTestTeamName(), Email: GenerateTestEmail(), Type: model.TEAM_OPEN, AllowOpenInvite: true} @@ -465,7 +465,7 @@ func TestGetAllTeams(t *testing.T) { func TestGetTeamByName(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client team := th.BasicTeam @@ -509,7 +509,7 @@ func TestGetTeamByName(t *testing.T) { func TestSearchAllTeams(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client oTeam := th.BasicTeam oTeam.AllowOpenInvite = true @@ -588,7 +588,7 @@ func TestSearchAllTeams(t *testing.T) { func TestGetTeamsForUser(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client team2 := &model.Team{DisplayName: "Name", Name: GenerateTestTeamName(), Email: GenerateTestEmail(), Type: model.TEAM_INVITE} @@ -630,7 +630,7 @@ func TestGetTeamsForUser(t *testing.T) { func TestGetTeamMember(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client team := th.BasicTeam user := th.BasicUser @@ -667,7 +667,7 @@ func TestGetTeamMember(t *testing.T) { func TestGetTeamMembers(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client team := th.BasicTeam userNotMember := th.CreateUser() @@ -721,7 +721,7 @@ func TestGetTeamMembers(t *testing.T) { func TestGetTeamMembersForUser(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client members, resp := Client.GetTeamMembersForUser(th.BasicUser.Id, "") @@ -759,7 +759,7 @@ func TestGetTeamMembersForUser(t *testing.T) { func TestGetTeamMembersByIds(t *testing.T) { th := Setup().InitBasic() - defer TearDown() + defer th.TearDown() Client := th.Client tm, resp := Client.GetTeamMembersByIds(th.BasicTeam.Id, []string{th.BasicUser.Id}) @@ -797,7 +797,7 @@ func TestGetTeamMembersByIds(t *testing.T) { func TestAddTeamMember(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client team := th.BasicTeam otherUser := th.CreateUser() @@ -885,7 +885,7 @@ func TestAddTeamMember(t *testing.T) { CheckForbiddenStatus(t, resp) // Update user to team admin - UpdateUserToTeamAdmin(th.BasicUser, th.BasicTeam) + th.UpdateUserToTeamAdmin(th.BasicUser, th.BasicTeam) th.App.InvalidateAllCaches() *utils.Cfg.TeamSettings.RestrictTeamInvite = model.PERMISSIONS_TEAM_ADMIN utils.SetIsLicensed(true) @@ -911,7 +911,7 @@ func TestAddTeamMember(t *testing.T) { CheckNoError(t, resp) // Change permission level to All - UpdateUserToNonTeamAdmin(th.BasicUser, th.BasicTeam) + th.UpdateUserToNonTeamAdmin(th.BasicUser, th.BasicTeam) th.App.InvalidateAllCaches() *utils.Cfg.TeamSettings.RestrictTeamInvite = model.PERMISSIONS_ALL utils.SetIsLicensed(true) @@ -1010,7 +1010,7 @@ func TestAddTeamMember(t *testing.T) { func TestAddTeamMembers(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client team := th.BasicTeam otherUser := th.CreateUser() @@ -1099,7 +1099,7 @@ func TestAddTeamMembers(t *testing.T) { CheckForbiddenStatus(t, resp) // Update user to team admin - UpdateUserToTeamAdmin(th.BasicUser, th.BasicTeam) + th.UpdateUserToTeamAdmin(th.BasicUser, th.BasicTeam) th.App.InvalidateAllCaches() *utils.Cfg.TeamSettings.RestrictTeamInvite = model.PERMISSIONS_TEAM_ADMIN utils.SetIsLicensed(true) @@ -1125,7 +1125,7 @@ func TestAddTeamMembers(t *testing.T) { CheckNoError(t, resp) // Change permission level to All - UpdateUserToNonTeamAdmin(th.BasicUser, th.BasicTeam) + th.UpdateUserToNonTeamAdmin(th.BasicUser, th.BasicTeam) th.App.InvalidateAllCaches() *utils.Cfg.TeamSettings.RestrictTeamInvite = model.PERMISSIONS_ALL utils.SetIsLicensed(true) @@ -1141,7 +1141,7 @@ func TestAddTeamMembers(t *testing.T) { func TestRemoveTeamMember(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client pass, resp := Client.RemoveTeamMember(th.BasicTeam.Id, th.BasicUser.Id) @@ -1172,7 +1172,7 @@ func TestRemoveTeamMember(t *testing.T) { func TestGetTeamStats(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client team := th.BasicTeam @@ -1227,7 +1227,7 @@ func TestGetTeamStats(t *testing.T) { func TestUpdateTeamMemberRoles(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client SystemAdminClient := th.SystemAdminClient @@ -1269,7 +1269,7 @@ func TestUpdateTeamMemberRoles(t *testing.T) { CheckBadRequestStatus(t, resp) // user 1 (team admin) demotes system admin (member of a team) - LinkUserToTeam(th.SystemAdminUser, th.BasicTeam) + th.LinkUserToTeam(th.SystemAdminUser, th.BasicTeam) _, resp = Client.UpdateTeamMemberRoles(th.BasicTeam.Id, th.SystemAdminUser.Id, TEAM_MEMBER) CheckNoError(t, resp) // Note from API v3 @@ -1305,7 +1305,7 @@ func TestUpdateTeamMemberRoles(t *testing.T) { func TestGetMyTeamsUnread(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client user := th.BasicUser @@ -1336,7 +1336,7 @@ func TestGetMyTeamsUnread(t *testing.T) { func TestTeamExists(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client team := th.BasicTeam @@ -1361,7 +1361,7 @@ func TestTeamExists(t *testing.T) { func TestImportTeam(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() t.Run("ImportTeam", func(t *testing.T) { var data []byte @@ -1440,7 +1440,7 @@ func TestImportTeam(t *testing.T) { func TestInviteUsersToTeam(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() user1 := GenerateTestEmail() user2 := GenerateTestEmail() @@ -1505,7 +1505,7 @@ func TestInviteUsersToTeam(t *testing.T) { func TestGetTeamInviteInfo(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client team := th.BasicTeam diff --git a/api4/user_test.go b/api4/user_test.go index 6a6436896..b2d6d14dd 100644 --- a/api4/user_test.go +++ b/api4/user_test.go @@ -18,7 +18,7 @@ import ( func TestCreateUser(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client AdminClient := th.SystemAdminClient @@ -88,7 +88,7 @@ func TestCreateUser(t *testing.T) { func TestCreateUserWithHash(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client t.Run("CreateWithHashHappyPath", func(t *testing.T) { @@ -231,7 +231,7 @@ func TestCreateUserWithHash(t *testing.T) { func TestCreateUserWithInviteId(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client AdminClient := th.SystemAdminClient @@ -333,7 +333,7 @@ func TestCreateUserWithInviteId(t *testing.T) { func TestGetMe(t *testing.T) { th := Setup().InitBasic() - defer TearDown() + defer th.TearDown() Client := th.Client ruser, resp := Client.GetMe("") @@ -350,7 +350,7 @@ func TestGetMe(t *testing.T) { func TestGetUser(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client user := th.CreateUser() @@ -414,7 +414,7 @@ func TestGetUser(t *testing.T) { func TestGetUserByUsername(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client user := th.BasicUser @@ -475,7 +475,7 @@ func TestGetUserByUsername(t *testing.T) { func TestGetUserByEmail(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client user := th.CreateUser() @@ -539,7 +539,7 @@ func TestGetUserByEmail(t *testing.T) { func TestSearchUsers(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client search := &model.UserSearch{Term: th.BasicUser.Username} @@ -728,7 +728,7 @@ func findUserInList(id string, users []*model.User) bool { func TestAutocompleteUsers(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client teamId := th.BasicTeam.Id channelId := th.BasicChannel.Id @@ -855,7 +855,7 @@ func TestAutocompleteUsers(t *testing.T) { func TestGetProfileImage(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client user := th.BasicUser @@ -888,6 +888,8 @@ func TestGetProfileImage(t *testing.T) { func TestGetUsersByIds(t *testing.T) { th := Setup().InitBasic() + defer th.TearDown() + Client := th.Client users, resp := Client.GetUsersByIds([]string{th.BasicUser.Id}) @@ -920,6 +922,8 @@ func TestGetUsersByIds(t *testing.T) { func TestGetUsersByUsernames(t *testing.T) { th := Setup().InitBasic() + defer th.TearDown() + Client := th.Client users, resp := Client.GetUsersByUsernames([]string{th.BasicUser.Username}) @@ -952,7 +956,7 @@ func TestGetUsersByUsernames(t *testing.T) { func TestUpdateUser(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client user := th.CreateUser() @@ -1008,7 +1012,7 @@ func TestUpdateUser(t *testing.T) { func TestPatchUser(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client user := th.CreateUser() @@ -1087,6 +1091,8 @@ func TestPatchUser(t *testing.T) { func TestDeleteUser(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() + defer th.TearDown() + Client := th.Client user := th.BasicUser @@ -1117,6 +1123,8 @@ func TestDeleteUser(t *testing.T) { func TestUpdateUserRoles(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() + defer th.TearDown() + Client := th.Client SystemAdminClient := th.SystemAdminClient @@ -1141,6 +1149,8 @@ func TestUpdateUserRoles(t *testing.T) { func TestUpdateUserActive(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() + defer th.TearDown() + Client := th.Client SystemAdminClient := th.SystemAdminClient user := th.BasicUser @@ -1184,7 +1194,7 @@ func TestUpdateUserActive(t *testing.T) { func TestGetUsers(t *testing.T) { th := Setup().InitBasic() - defer TearDown() + defer th.TearDown() Client := th.Client rusers, resp := Client.GetUsers(0, 60, "") @@ -1226,7 +1236,7 @@ func TestGetUsers(t *testing.T) { func TestGetNewUsersInTeam(t *testing.T) { th := Setup().InitBasic() - defer TearDown() + defer th.TearDown() Client := th.Client teamId := th.BasicTeam.Id @@ -1255,7 +1265,7 @@ func TestGetNewUsersInTeam(t *testing.T) { func TestGetRecentlyActiveUsersInTeam(t *testing.T) { th := Setup().InitBasic() - defer TearDown() + defer th.TearDown() Client := th.Client teamId := th.BasicTeam.Id @@ -1284,7 +1294,7 @@ func TestGetRecentlyActiveUsersInTeam(t *testing.T) { func TestGetUsersWithoutTeam(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client SystemAdminClient := th.SystemAdminClient @@ -1300,7 +1310,7 @@ func TestGetUsersWithoutTeam(t *testing.T) { Password: "Password1", }) CheckNoError(t, resp) - LinkUserToTeam(user, th.BasicTeam) + th.LinkUserToTeam(user, th.BasicTeam) defer th.App.Srv.Store.User().PermanentDelete(user.Id) user2, resp := Client.CreateUser(&model.User{ @@ -1334,7 +1344,7 @@ func TestGetUsersWithoutTeam(t *testing.T) { func TestGetUsersInTeam(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client teamId := th.BasicTeam.Id @@ -1380,7 +1390,7 @@ func TestGetUsersInTeam(t *testing.T) { func TestGetUsersNotInTeam(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client teamId := th.BasicTeam.Id @@ -1426,7 +1436,7 @@ func TestGetUsersNotInTeam(t *testing.T) { func TestGetUsersInChannel(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client channelId := th.BasicChannel.Id @@ -1469,13 +1479,13 @@ func TestGetUsersInChannel(t *testing.T) { func TestGetUsersNotInChannel(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client teamId := th.BasicTeam.Id channelId := th.BasicChannel.Id user := th.CreateUser() - LinkUserToTeam(user, th.BasicTeam) + th.LinkUserToTeam(user, th.BasicTeam) rusers, resp := Client.GetUsersNotInChannel(teamId, channelId, 0, 60, "") CheckNoError(t, resp) @@ -1510,7 +1520,7 @@ func TestGetUsersNotInChannel(t *testing.T) { /*func TestUpdateUserMfa(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client isLicensed := utils.IsLicensed() @@ -1530,7 +1540,7 @@ func TestGetUsersNotInChannel(t *testing.T) { user := model.User{Email: strings.ToLower(model.NewId()) + "success+test@simulator.amazonses.com", Nickname: "Corey Hulen", Password: "passwd1"} ruser, _ := Client.CreateUser(&user) - LinkUserToTeam(ruser, rteam) + th.LinkUserToTeam(ruser, rteam) store.Must(app.Srv.Store.User().VerifyEmail(ruser.Id)) Client.Logout() @@ -1552,7 +1562,7 @@ func TestGetUsersNotInChannel(t *testing.T) { func TestCheckUserMfa(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client required, resp := Client.CheckUserMfa(th.BasicUser.Email) @@ -1609,7 +1619,7 @@ func TestCheckUserMfa(t *testing.T) { func TestGenerateMfaSecret(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client _, resp := Client.GenerateMfaSecret(th.BasicUser.Id) @@ -1632,7 +1642,7 @@ func TestGenerateMfaSecret(t *testing.T) { func TestUpdateUserPassword(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client password := "newpassword1" @@ -1809,7 +1819,7 @@ func TestUpdateUserPassword(t *testing.T) { func TestGetSessions(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client user := th.BasicUser @@ -1849,7 +1859,7 @@ func TestGetSessions(t *testing.T) { func TestRevokeSessions(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client user := th.BasicUser @@ -1904,7 +1914,7 @@ func TestRevokeSessions(t *testing.T) { func TestAttachDeviceId(t *testing.T) { th := Setup().InitBasic() - defer TearDown() + defer th.TearDown() Client := th.Client deviceId := model.PUSH_NOTIFY_APPLE + ":1234567890" @@ -1934,7 +1944,7 @@ func TestAttachDeviceId(t *testing.T) { func TestGetUserAudits(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client user := th.BasicUser @@ -1959,7 +1969,7 @@ func TestGetUserAudits(t *testing.T) { func TestVerifyUserEmail(t *testing.T) { th := Setup().InitBasic() - defer TearDown() + defer th.TearDown() Client := th.Client user := model.User{Email: GenerateTestEmail(), Nickname: "Darth Vader", Password: "hello1", Username: GenerateTestUsername(), Roles: model.ROLE_SYSTEM_ADMIN.Id + " " + model.ROLE_SYSTEM_USER.Id} @@ -1983,7 +1993,7 @@ func TestVerifyUserEmail(t *testing.T) { func TestSendVerificationEmail(t *testing.T) { th := Setup().InitBasic() - defer TearDown() + defer th.TearDown() Client := th.Client pass, resp := Client.SendVerificationEmail(th.BasicUser.Email) @@ -2007,7 +2017,7 @@ func TestSendVerificationEmail(t *testing.T) { func TestSetProfileImage(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client user := th.BasicUser @@ -2058,7 +2068,7 @@ func TestSetProfileImage(t *testing.T) { func TestSwitchAccount(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client enableGitLab := utils.Cfg.GitLabSettings.Enable @@ -2149,7 +2159,7 @@ func TestSwitchAccount(t *testing.T) { func TestCreateUserAccessToken(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client AdminClient := th.SystemAdminClient @@ -2223,7 +2233,7 @@ func TestCreateUserAccessToken(t *testing.T) { func TestGetUserAccessToken(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client AdminClient := th.SystemAdminClient @@ -2294,7 +2304,7 @@ func TestGetUserAccessToken(t *testing.T) { func TestRevokeUserAccessToken(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client AdminClient := th.SystemAdminClient @@ -2342,7 +2352,7 @@ func TestRevokeUserAccessToken(t *testing.T) { func TestUserAccessTokenInactiveUser(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client testDescription := "test token" @@ -2369,7 +2379,7 @@ func TestUserAccessTokenInactiveUser(t *testing.T) { func TestUserAccessTokenDisableConfig(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client testDescription := "test token" diff --git a/api4/webhook_test.go b/api4/webhook_test.go index f85761026..b09f4411e 100644 --- a/api4/webhook_test.go +++ b/api4/webhook_test.go @@ -16,7 +16,7 @@ import ( func TestCreateIncomingWebhook(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client enableIncomingHooks := utils.Cfg.ServiceSettings.EnableIncomingWebhooks @@ -73,7 +73,7 @@ func TestCreateIncomingWebhook(t *testing.T) { func TestGetIncomingWebhooks(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client enableIncomingHooks := utils.Cfg.ServiceSettings.EnableIncomingWebhooks @@ -155,7 +155,7 @@ func TestGetIncomingWebhooks(t *testing.T) { func TestGetIncomingWebhook(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.SystemAdminClient enableIncomingHooks := utils.Cfg.ServiceSettings.EnableIncomingWebhooks @@ -203,7 +203,7 @@ func TestGetIncomingWebhook(t *testing.T) { func TestDeleteIncomingWebhook(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.SystemAdminClient enableIncomingHooks := utils.Cfg.ServiceSettings.EnableIncomingWebhooks @@ -263,7 +263,7 @@ func TestDeleteIncomingWebhook(t *testing.T) { func TestCreateOutgoingWebhook(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client enableOutgoingHooks := utils.Cfg.ServiceSettings.EnableOutgoingWebhooks @@ -316,7 +316,7 @@ func TestCreateOutgoingWebhook(t *testing.T) { func TestGetOutgoingWebhooks(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client enableOutgoingHooks := utils.Cfg.ServiceSettings.EnableOutgoingWebhooks @@ -425,7 +425,7 @@ func TestGetOutgoingWebhooks(t *testing.T) { func TestGetOutgoingWebhook(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client enableOutgoingHooks := utils.Cfg.ServiceSettings.EnableOutgoingWebhooks @@ -464,7 +464,7 @@ func TestGetOutgoingWebhook(t *testing.T) { func TestUpdateIncomingHook(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client enableIncomingHooks := utils.Cfg.ServiceSettings.EnableIncomingWebhooks @@ -585,7 +585,7 @@ func TestUpdateIncomingHook(t *testing.T) { utils.SetDefaultRolesBasedOnConfig() Client.Logout() - UpdateUserToTeamAdmin(th.BasicUser2, th.BasicTeam) + th.UpdateUserToTeamAdmin(th.BasicUser2, th.BasicTeam) th.LoginBasic2() t.Run("UpdateByDifferentUser", func(t *testing.T) { updatedHook, resp := Client.UpdateIncomingWebhook(createdHook) @@ -622,7 +622,7 @@ func TestUpdateIncomingHook(t *testing.T) { team := th.CreateTeamWithClient(Client) user := th.CreateUserWithClient(Client) - LinkUserToTeam(user, team) + th.LinkUserToTeam(user, team) Client.Logout() Client.Login(user.Id, user.Password) t.Run("UpdateToADifferentTeam", func(t *testing.T) { @@ -633,7 +633,7 @@ func TestUpdateIncomingHook(t *testing.T) { func TestRegenOutgoingHookToken(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client enableOutgoingHooks := utils.Cfg.ServiceSettings.EnableOutgoingWebhooks @@ -674,7 +674,7 @@ func TestRegenOutgoingHookToken(t *testing.T) { func TestUpdateOutgoingHook(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client enableOutgoingHooks := utils.Cfg.ServiceSettings.EnableOutgoingWebhooks @@ -774,7 +774,7 @@ func TestUpdateOutgoingHook(t *testing.T) { utils.SetDefaultRolesBasedOnConfig() Client.Logout() - UpdateUserToTeamAdmin(th.BasicUser2, th.BasicTeam) + th.UpdateUserToTeamAdmin(th.BasicUser2, th.BasicTeam) th.LoginBasic2() t.Run("RetainHookCreator", func(t *testing.T) { createdHook.DisplayName = "Basic user 2" @@ -830,7 +830,7 @@ func TestUpdateOutgoingHook(t *testing.T) { team := th.CreateTeamWithClient(Client) user := th.CreateUserWithClient(Client) - LinkUserToTeam(user, team) + th.LinkUserToTeam(user, team) Client.Logout() Client.Login(user.Id, user.Password) t.Run("UpdateToADifferentTeam", func(t *testing.T) { @@ -841,7 +841,7 @@ func TestUpdateOutgoingHook(t *testing.T) { func TestDeleteOutgoingHook(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.SystemAdminClient enableIncomingHooks := utils.Cfg.ServiceSettings.EnableIncomingWebhooks @@ -903,6 +903,8 @@ func TestDeleteOutgoingHook(t *testing.T) { func TestCommandWebhooks(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() + defer th.TearDown() + Client := th.SystemAdminClient cmd := &model.Command{ diff --git a/api4/webrtc_test.go b/api4/webrtc_test.go index 18a1d0959..4e2f28fb5 100644 --- a/api4/webrtc_test.go +++ b/api4/webrtc_test.go @@ -15,7 +15,7 @@ func TestGetWebrtcToken(t *testing.T) { } th := Setup().InitBasic().InitSystemAdmin() - defer TearDown() + defer th.TearDown() Client := th.Client enableWebrtc := *utils.Cfg.WebrtcSettings.Enable diff --git a/api4/websocket_test.go b/api4/websocket_test.go index f07e09b55..fa40629dc 100644 --- a/api4/websocket_test.go +++ b/api4/websocket_test.go @@ -12,7 +12,7 @@ import ( func TestWebSocket(t *testing.T) { th := Setup().InitBasic() - defer TearDown() + defer th.TearDown() WebSocketClient, err := th.CreateWebSocketClient() if err != nil { t.Fatal(err) @@ -71,12 +71,3 @@ func TestWebSocket(t *testing.T) { } } } - -func TestZZWebSocketTearDown(t *testing.T) { - // *IMPORTANT* - Kind of hacky - // This should be the last function in any test file - // that calls Setup() - // Should be in the last file too sorted by name - time.Sleep(2 * time.Second) - StopServer() -} -- cgit v1.2.3-1-g7c22