Passing t to all tests setup functions (#13841)

* Passing t to all tests setup functions

* Fixing build
Этот коммит содержится в:
Jesús Espino
2020-02-10 19:31:41 +01:00
коммит произвёл GitHub
родитель 3b732fe257
Коммит 1d1ab03c38
73 изменённых файлов: 646 добавлений и 632 удалений

Просмотреть файл

@@ -22,7 +22,7 @@ import (
)
func TestCreateUser(t *testing.T) {
th := Setup().InitBasic()
th := Setup(t).InitBasic()
defer th.TearDown()
user := model.User{Email: th.GenerateTestEmail(), Nickname: "Corey Hulen", Password: "hello1", Username: GenerateTestUsername(), Roles: model.SYSTEM_ADMIN_ROLE_ID + " " + model.SYSTEM_USER_ROLE_ID}
@@ -77,7 +77,7 @@ func TestCreateUser(t *testing.T) {
}
func TestCreateUserInputFilter(t *testing.T) {
th := Setup().InitBasic()
th := Setup(t).InitBasic()
defer th.TearDown()
t.Run("DomainRestriction", func(t *testing.T) {
@@ -146,7 +146,7 @@ func TestCreateUserInputFilter(t *testing.T) {
}
func TestCreateUserWithToken(t *testing.T) {
th := Setup().InitBasic()
th := Setup(t).InitBasic()
defer th.TearDown()
t.Run("CreateWithTokenHappyPath", func(t *testing.T) {
@@ -267,7 +267,7 @@ func TestCreateUserWithToken(t *testing.T) {
}
func TestCreateUserWebSocketEvent(t *testing.T) {
th := Setup().InitBasic()
th := Setup(t).InitBasic()
defer th.TearDown()
t.Run("guest should not received new_user event but user should", func(t *testing.T) {
@@ -343,7 +343,7 @@ func TestCreateUserWebSocketEvent(t *testing.T) {
}
func TestCreateUserWithInviteId(t *testing.T) {
th := Setup().InitBasic()
th := Setup(t).InitBasic()
defer th.TearDown()
t.Run("CreateWithInviteIdHappyPath", func(t *testing.T) {
@@ -454,7 +454,7 @@ func TestCreateUserWithInviteId(t *testing.T) {
}
func TestGetMe(t *testing.T) {
th := Setup().InitBasic()
th := Setup(t).InitBasic()
defer th.TearDown()
ruser, resp := th.Client.GetMe("")
@@ -468,7 +468,7 @@ func TestGetMe(t *testing.T) {
}
func TestGetUser(t *testing.T) {
th := Setup().InitBasic()
th := Setup(t).InitBasic()
defer th.TearDown()
user := th.CreateUser()
@@ -518,7 +518,7 @@ func TestGetUser(t *testing.T) {
}
func TestGetUserWithAcceptedTermsOfServiceForOtherUser(t *testing.T) {
th := Setup().InitBasic()
th := Setup(t).InitBasic()
defer th.TearDown()
user := th.CreateUser()
@@ -548,7 +548,7 @@ func TestGetUserWithAcceptedTermsOfServiceForOtherUser(t *testing.T) {
}
func TestGetUserWithAcceptedTermsOfService(t *testing.T) {
th := Setup().InitBasic()
th := Setup(t).InitBasic()
defer th.TearDown()
user := th.BasicUser
@@ -576,7 +576,7 @@ func TestGetUserWithAcceptedTermsOfService(t *testing.T) {
}
func TestGetUserWithAcceptedTermsOfServiceWithAdminUser(t *testing.T) {
th := Setup().InitBasic()
th := Setup(t).InitBasic()
th.LoginSystemAdmin()
defer th.TearDown()
@@ -605,7 +605,7 @@ func TestGetUserWithAcceptedTermsOfServiceWithAdminUser(t *testing.T) {
}
func TestGetBotUser(t *testing.T) {
th := Setup().InitBasic()
th := Setup(t).InitBasic()
defer th.TearDown()
defer th.RestoreDefaultRolePermissions(th.SaveDefaultRolePermissions())
@@ -634,7 +634,7 @@ func TestGetBotUser(t *testing.T) {
}
func TestGetUserByUsername(t *testing.T) {
th := Setup().InitBasic()
th := Setup(t).InitBasic()
defer th.TearDown()
user := th.BasicUser
@@ -678,7 +678,7 @@ func TestGetUserByUsername(t *testing.T) {
}
func TestGetUserByUsernameWithAcceptedTermsOfService(t *testing.T) {
th := Setup().InitBasic()
th := Setup(t).InitBasic()
defer th.TearDown()
user := th.BasicUser
@@ -702,7 +702,7 @@ func TestGetUserByUsernameWithAcceptedTermsOfService(t *testing.T) {
}
func TestGetUserByEmail(t *testing.T) {
th := Setup().InitBasic()
th := Setup(t).InitBasic()
defer th.TearDown()
user := th.CreateUser()
@@ -817,7 +817,7 @@ func TestGetUserByEmail(t *testing.T) {
}
func TestSearchUsers(t *testing.T) {
th := Setup().InitBasic()
th := Setup(t).InitBasic()
defer th.TearDown()
search := &model.UserSearch{Term: th.BasicUser.Username}
@@ -969,7 +969,7 @@ func findUserInList(id string, users []*model.User) bool {
}
func TestAutocompleteUsersInChannel(t *testing.T) {
th := Setup().InitBasic()
th := Setup(t).InitBasic()
defer th.TearDown()
teamId := th.BasicTeam.Id
channelId := th.BasicChannel.Id
@@ -1091,7 +1091,7 @@ func TestAutocompleteUsersInChannel(t *testing.T) {
}
func TestAutocompleteUsersInTeam(t *testing.T) {
th := Setup().InitBasic()
th := Setup(t).InitBasic()
defer th.TearDown()
teamId := th.BasicTeam.Id
username := th.BasicUser.Username
@@ -1160,7 +1160,7 @@ func TestAutocompleteUsersInTeam(t *testing.T) {
}
func TestAutocompleteUsers(t *testing.T) {
th := Setup().InitBasic()
th := Setup(t).InitBasic()
defer th.TearDown()
username := th.BasicUser.Username
newUser := th.CreateUser()
@@ -1225,7 +1225,7 @@ func TestAutocompleteUsers(t *testing.T) {
}
func TestGetProfileImage(t *testing.T) {
th := Setup().InitBasic()
th := Setup(t).InitBasic()
defer th.TearDown()
user := th.BasicUser
@@ -1255,7 +1255,7 @@ func TestGetProfileImage(t *testing.T) {
}
func TestGetUsersByIds(t *testing.T) {
th := Setup().InitBasic()
th := Setup(t).InitBasic()
defer th.TearDown()
t.Run("should return the user", func(t *testing.T) {
@@ -1298,7 +1298,7 @@ func TestGetUsersByIds(t *testing.T) {
func TestGetUsersByIdsWithOptions(t *testing.T) {
t.Run("should only return specified users that have been updated since the given time", func(t *testing.T) {
th := Setup().InitBasic()
th := Setup(t).InitBasic()
defer th.TearDown()
// Users before the timestamp shouldn't be returned
@@ -1323,7 +1323,7 @@ func TestGetUsersByIdsWithOptions(t *testing.T) {
}
func TestGetUsersByGroupChannelIds(t *testing.T) {
th := Setup().InitBasic()
th := Setup(t).InitBasic()
defer th.TearDown()
gc1, err := th.App.CreateGroupChannel([]string{th.BasicUser.Id, th.SystemAdminUser.Id, th.TeamAdminUser.Id}, th.BasicUser.Id)
@@ -1354,7 +1354,7 @@ func TestGetUsersByGroupChannelIds(t *testing.T) {
}
func TestGetUsersByUsernames(t *testing.T) {
th := Setup().InitBasic()
th := Setup(t).InitBasic()
defer th.TearDown()
users, resp := th.Client.GetUsersByUsernames([]string{th.BasicUser.Username})
@@ -1380,7 +1380,7 @@ func TestGetUsersByUsernames(t *testing.T) {
}
func TestGetTotalUsersStat(t *testing.T) {
th := Setup().InitBasic()
th := Setup(t).InitBasic()
defer th.TearDown()
total, _ := th.Server.Store.User().Count(model.UserCountOptions{
@@ -1395,7 +1395,7 @@ func TestGetTotalUsersStat(t *testing.T) {
}
func TestUpdateUser(t *testing.T) {
th := Setup().InitBasic()
th := Setup(t).InitBasic()
defer th.TearDown()
user := th.CreateUser()
@@ -1456,7 +1456,7 @@ func TestUpdateUser(t *testing.T) {
}
func TestPatchUser(t *testing.T) {
th := Setup().InitBasic()
th := Setup(t).InitBasic()
defer th.TearDown()
user := th.CreateUser()
@@ -1550,7 +1550,7 @@ func TestPatchUser(t *testing.T) {
}
func TestUpdateUserAuth(t *testing.T) {
th := Setup().InitBasic()
th := Setup(t).InitBasic()
defer th.TearDown()
team := th.CreateTeamWithClient(th.SystemAdminClient)
@@ -1604,7 +1604,7 @@ func TestUpdateUserAuth(t *testing.T) {
}
func TestDeleteUser(t *testing.T) {
th := Setup().InitBasic()
th := Setup(t).InitBasic()
defer th.TearDown()
user := th.BasicUser
@@ -1649,7 +1649,7 @@ func TestDeleteUser(t *testing.T) {
}
func TestUpdateUserRoles(t *testing.T) {
th := Setup().InitBasic()
th := Setup(t).InitBasic()
defer th.TearDown()
_, resp := th.Client.UpdateUserRoles(th.SystemAdminUser.Id, model.SYSTEM_USER_ROLE_ID)
@@ -1696,7 +1696,7 @@ func assertWebsocketEventUserUpdatedWithEmail(t *testing.T, client *model.WebSoc
func TestUpdateUserActive(t *testing.T) {
t.Run("basic tests", func(t *testing.T) {
th := Setup().InitBasic()
th := Setup(t).InitBasic()
defer th.TearDown()
user := th.BasicUser
@@ -1750,7 +1750,7 @@ func TestUpdateUserActive(t *testing.T) {
})
t.Run("websocket events", func(t *testing.T) {
th := Setup().InitBasic()
th := Setup(t).InitBasic()
defer th.TearDown()
user := th.BasicUser2
@@ -1795,7 +1795,7 @@ func TestUpdateUserActive(t *testing.T) {
})
t.Run("activate guest should fail when guests feature is disable", func(t *testing.T) {
th := Setup().InitBasic()
th := Setup(t).InitBasic()
defer th.TearDown()
id := model.NewId()
@@ -1817,7 +1817,7 @@ func TestUpdateUserActive(t *testing.T) {
})
t.Run("activate guest should work when guests feature is enabled", func(t *testing.T) {
th := Setup().InitBasic()
th := Setup(t).InitBasic()
defer th.TearDown()
id := model.NewId()
@@ -1839,7 +1839,7 @@ func TestUpdateUserActive(t *testing.T) {
}
func TestGetUsers(t *testing.T) {
th := Setup().InitBasic()
th := Setup(t).InitBasic()
defer th.TearDown()
rusers, resp := th.Client.GetUsers(0, 60, "")
@@ -1870,7 +1870,7 @@ func TestGetUsers(t *testing.T) {
}
func TestGetNewUsersInTeam(t *testing.T) {
th := Setup().InitBasic()
th := Setup(t).InitBasic()
defer th.TearDown()
teamId := th.BasicTeam.Id
@@ -1894,7 +1894,7 @@ func TestGetNewUsersInTeam(t *testing.T) {
}
func TestGetRecentlyActiveUsersInTeam(t *testing.T) {
th := Setup().InitBasic()
th := Setup(t).InitBasic()
defer th.TearDown()
teamId := th.BasicTeam.Id
@@ -1918,7 +1918,7 @@ func TestGetRecentlyActiveUsersInTeam(t *testing.T) {
}
func TestGetUsersWithoutTeam(t *testing.T) {
th := Setup().InitBasic()
th := Setup(t).InitBasic()
defer th.TearDown()
_, resp := th.Client.GetUsersWithoutTeam(0, 100, "")
@@ -1962,7 +1962,7 @@ func TestGetUsersWithoutTeam(t *testing.T) {
}
func TestGetUsersInTeam(t *testing.T) {
th := Setup().InitBasic()
th := Setup(t).InitBasic()
defer th.TearDown()
teamId := th.BasicTeam.Id
@@ -2001,7 +2001,7 @@ func TestGetUsersInTeam(t *testing.T) {
}
func TestGetUsersNotInTeam(t *testing.T) {
th := Setup().InitBasic()
th := Setup(t).InitBasic()
defer th.TearDown()
teamId := th.BasicTeam.Id
@@ -2041,7 +2041,7 @@ func TestGetUsersNotInTeam(t *testing.T) {
}
func TestGetUsersInChannel(t *testing.T) {
th := Setup().InitBasic()
th := Setup(t).InitBasic()
defer th.TearDown()
channelId := th.BasicChannel.Id
@@ -2077,7 +2077,7 @@ func TestGetUsersInChannel(t *testing.T) {
}
func TestGetUsersNotInChannel(t *testing.T) {
th := Setup().InitBasic()
th := Setup(t).InitBasic()
defer th.TearDown()
teamId := th.BasicTeam.Id
channelId := th.BasicChannel.Id
@@ -2112,7 +2112,7 @@ func TestGetUsersNotInChannel(t *testing.T) {
}
func TestUpdateUserMfa(t *testing.T) {
th := Setup().InitBasic()
th := Setup(t).InitBasic()
defer th.TearDown()
th.App.SetLicense(model.NewTestLicense("mfa"))
@@ -2128,7 +2128,7 @@ func TestUpdateUserMfa(t *testing.T) {
// CheckUserMfa is deprecated and should not be used anymore, it will be disabled by default in version 6.0
func TestCheckUserMfa(t *testing.T) {
th := Setup().InitBasic()
th := Setup(t).InitBasic()
defer th.TearDown()
th.App.UpdateConfig(func(c *model.Config) {
@@ -2176,7 +2176,7 @@ func TestCheckUserMfa(t *testing.T) {
}
func TestUserLoginMFAFlow(t *testing.T) {
th := Setup().InitBasic()
th := Setup(t).InitBasic()
defer th.TearDown()
th.App.UpdateConfig(func(c *model.Config) {
@@ -2242,7 +2242,7 @@ func TestUserLoginMFAFlow(t *testing.T) {
}
func TestGenerateMfaSecret(t *testing.T) {
th := Setup().InitBasic()
th := Setup(t).InitBasic()
defer th.TearDown()
th.App.UpdateConfig(func(cfg *model.Config) { *cfg.ServiceSettings.EnableMultifactorAuthentication = false })
@@ -2276,7 +2276,7 @@ func TestGenerateMfaSecret(t *testing.T) {
}
func TestUpdateUserPassword(t *testing.T) {
th := Setup().InitBasic()
th := Setup(t).InitBasic()
defer th.TearDown()
password := "newpassword1"
@@ -2341,7 +2341,7 @@ func TestUpdateUserPassword(t *testing.T) {
func TestResetPassword(t *testing.T) {
t.Skip("test disabled during old build server changes, should be investigated")
th := Setup().InitBasic()
th := Setup(t).InitBasic()
defer th.TearDown()
th.Client.Logout()
user := th.BasicUser
@@ -2409,7 +2409,7 @@ func TestResetPassword(t *testing.T) {
}
func TestGetSessions(t *testing.T) {
th := Setup().InitBasic()
th := Setup(t).InitBasic()
defer th.TearDown()
user := th.BasicUser
@@ -2446,7 +2446,7 @@ func TestGetSessions(t *testing.T) {
}
func TestRevokeSessions(t *testing.T) {
th := Setup().InitBasic()
th := Setup(t).InitBasic()
defer th.TearDown()
user := th.BasicUser
@@ -2498,7 +2498,7 @@ func TestRevokeSessions(t *testing.T) {
}
func TestRevokeAllSessions(t *testing.T) {
th := Setup().InitBasic()
th := Setup(t).InitBasic()
defer th.TearDown()
user := th.BasicUser
@@ -2534,7 +2534,7 @@ func TestRevokeAllSessions(t *testing.T) {
}
func TestRevokeSessionsFromAllUsers(t *testing.T) {
th := Setup().InitBasic()
th := Setup(t).InitBasic()
defer th.TearDown()
user := th.BasicUser
@@ -2574,7 +2574,7 @@ func TestRevokeSessionsFromAllUsers(t *testing.T) {
}
func TestAttachDeviceId(t *testing.T) {
th := Setup().InitBasic()
th := Setup(t).InitBasic()
defer th.TearDown()
deviceId := model.PUSH_NOTIFY_APPLE + ":1234567890"
@@ -2624,7 +2624,7 @@ func TestAttachDeviceId(t *testing.T) {
}
func TestGetUserAudits(t *testing.T) {
th := Setup().InitBasic()
th := Setup(t).InitBasic()
defer th.TearDown()
user := th.BasicUser
@@ -2646,7 +2646,7 @@ func TestGetUserAudits(t *testing.T) {
}
func TestVerifyUserEmail(t *testing.T) {
th := Setup().InitBasic()
th := Setup(t).InitBasic()
defer th.TearDown()
email := th.GenerateTestEmail()
@@ -2668,7 +2668,7 @@ func TestVerifyUserEmail(t *testing.T) {
}
func TestSendVerificationEmail(t *testing.T) {
th := Setup().InitBasic()
th := Setup(t).InitBasic()
defer th.TearDown()
pass, resp := th.Client.SendVerificationEmail(th.BasicUser.Email)
@@ -2689,7 +2689,7 @@ func TestSendVerificationEmail(t *testing.T) {
}
func TestSetProfileImage(t *testing.T) {
th := Setup().InitBasic()
th := Setup(t).InitBasic()
defer th.TearDown()
user := th.BasicUser
@@ -2732,7 +2732,7 @@ func TestSetProfileImage(t *testing.T) {
}
func TestSetDefaultProfileImage(t *testing.T) {
th := Setup().InitBasic()
th := Setup(t).InitBasic()
defer th.TearDown()
user := th.BasicUser
@@ -2769,7 +2769,7 @@ func TestSetDefaultProfileImage(t *testing.T) {
}
func TestLogin(t *testing.T) {
th := Setup().InitBasic()
th := Setup(t).InitBasic()
defer th.TearDown()
th.Client.Logout()
@@ -2831,7 +2831,7 @@ func TestLogin(t *testing.T) {
func TestLoginCookies(t *testing.T) {
t.Run("should return cookies with X-Requested-With header", func(t *testing.T) {
th := Setup().InitBasic()
th := Setup(t).InitBasic()
defer th.TearDown()
th.Client.HttpHeader[model.HEADER_REQUESTED_WITH] = model.HEADER_REQUESTED_WITH_XML
@@ -2860,7 +2860,7 @@ func TestLoginCookies(t *testing.T) {
})
t.Run("should not return cookies without X-Requested-With header", func(t *testing.T) {
th := Setup().InitBasic()
th := Setup(t).InitBasic()
defer th.TearDown()
_, resp := th.Client.Login(th.BasicUser.Email, th.BasicUser.Password)
@@ -2869,7 +2869,7 @@ func TestLoginCookies(t *testing.T) {
})
t.Run("should include subpath in path", func(t *testing.T) {
th := Setup().InitBasic()
th := Setup(t).InitBasic()
defer th.TearDown()
th.Client.HttpHeader[model.HEADER_REQUESTED_WITH] = model.HEADER_REQUESTED_WITH_XML
@@ -2902,7 +2902,7 @@ func TestLoginCookies(t *testing.T) {
func TestCBALogin(t *testing.T) {
t.Run("primary", func(t *testing.T) {
th := Setup().InitBasic()
th := Setup(t).InitBasic()
defer th.TearDown()
th.App.SetLicense(model.NewTestLicense("saml"))
@@ -2960,7 +2960,7 @@ func TestCBALogin(t *testing.T) {
})
t.Run("secondary", func(t *testing.T) {
th := Setup().InitBasic()
th := Setup(t).InitBasic()
defer th.TearDown()
th.App.SetLicense(model.NewTestLicense("saml"))
@@ -3011,7 +3011,7 @@ func TestCBALogin(t *testing.T) {
}
func TestSwitchAccount(t *testing.T) {
th := Setup().InitBasic()
th := Setup(t).InitBasic()
defer th.TearDown()
th.App.UpdateConfig(func(cfg *model.Config) { *cfg.GitLabSettings.Enable = true })
@@ -3157,7 +3157,7 @@ func assertInvalidToken(t *testing.T, th *TestHelper, token *model.UserAccessTok
func TestCreateUserAccessToken(t *testing.T) {
t.Run("create token without permission", func(t *testing.T) {
th := Setup().InitBasic()
th := Setup(t).InitBasic()
defer th.TearDown()
th.App.UpdateConfig(func(cfg *model.Config) { *cfg.ServiceSettings.EnableUserAccessTokens = true })
@@ -3167,7 +3167,7 @@ func TestCreateUserAccessToken(t *testing.T) {
})
t.Run("create token for invalid user id", func(t *testing.T) {
th := Setup().InitBasic()
th := Setup(t).InitBasic()
defer th.TearDown()
th.App.UpdateConfig(func(cfg *model.Config) { *cfg.ServiceSettings.EnableUserAccessTokens = true })
@@ -3177,7 +3177,7 @@ func TestCreateUserAccessToken(t *testing.T) {
})
t.Run("create token with invalid value", func(t *testing.T) {
th := Setup().InitBasic()
th := Setup(t).InitBasic()
defer th.TearDown()
th.App.UpdateConfig(func(cfg *model.Config) { *cfg.ServiceSettings.EnableUserAccessTokens = true })
@@ -3187,7 +3187,7 @@ func TestCreateUserAccessToken(t *testing.T) {
})
t.Run("create token with user access tokens disabled", func(t *testing.T) {
th := Setup().InitBasic()
th := Setup(t).InitBasic()
defer th.TearDown()
th.App.UpdateConfig(func(cfg *model.Config) { *cfg.ServiceSettings.EnableUserAccessTokens = false })
@@ -3198,7 +3198,7 @@ func TestCreateUserAccessToken(t *testing.T) {
})
t.Run("create user access token", func(t *testing.T) {
th := Setup().InitBasic()
th := Setup(t).InitBasic()
defer th.TearDown()
th.App.UpdateConfig(func(cfg *model.Config) { *cfg.ServiceSettings.EnableUserAccessTokens = true })
@@ -3217,7 +3217,7 @@ func TestCreateUserAccessToken(t *testing.T) {
})
t.Run("create user access token as second user, without permission", func(t *testing.T) {
th := Setup().InitBasic()
th := Setup(t).InitBasic()
defer th.TearDown()
th.App.UpdateConfig(func(cfg *model.Config) { *cfg.ServiceSettings.EnableUserAccessTokens = true })
@@ -3227,7 +3227,7 @@ func TestCreateUserAccessToken(t *testing.T) {
})
t.Run("create user access token for basic user as as system admin", func(t *testing.T) {
th := Setup().InitBasic()
th := Setup(t).InitBasic()
defer th.TearDown()
th.App.UpdateConfig(func(cfg *model.Config) { *cfg.ServiceSettings.EnableUserAccessTokens = true })
@@ -3243,7 +3243,7 @@ func TestCreateUserAccessToken(t *testing.T) {
})
t.Run("create access token as oauth session", func(t *testing.T) {
th := Setup().InitBasic()
th := Setup(t).InitBasic()
defer th.TearDown()
th.App.UpdateConfig(func(cfg *model.Config) { *cfg.ServiceSettings.EnableUserAccessTokens = true })
@@ -3257,7 +3257,7 @@ func TestCreateUserAccessToken(t *testing.T) {
})
t.Run("create access token for bot created by user", func(t *testing.T) {
th := Setup().InitBasic()
th := Setup(t).InitBasic()
defer th.TearDown()
th.App.UpdateConfig(func(cfg *model.Config) { *cfg.ServiceSettings.EnableUserAccessTokens = true })
@@ -3296,7 +3296,7 @@ func TestCreateUserAccessToken(t *testing.T) {
})
t.Run("create access token for bot created by another user, only having MANAGE_BOTS permission", func(t *testing.T) {
th := Setup().InitBasic()
th := Setup(t).InitBasic()
defer th.TearDown()
th.App.UpdateConfig(func(cfg *model.Config) { *cfg.ServiceSettings.EnableUserAccessTokens = true })
@@ -3337,7 +3337,7 @@ func TestCreateUserAccessToken(t *testing.T) {
func TestGetUserAccessToken(t *testing.T) {
t.Run("get for invalid user id", func(t *testing.T) {
th := Setup().InitBasic()
th := Setup(t).InitBasic()
defer th.TearDown()
th.App.UpdateConfig(func(cfg *model.Config) { *cfg.ServiceSettings.EnableUserAccessTokens = true })
@@ -3347,7 +3347,7 @@ func TestGetUserAccessToken(t *testing.T) {
})
t.Run("get for unknown user id", func(t *testing.T) {
th := Setup().InitBasic()
th := Setup(t).InitBasic()
defer th.TearDown()
th.App.UpdateConfig(func(cfg *model.Config) { *cfg.ServiceSettings.EnableUserAccessTokens = true })
@@ -3357,7 +3357,7 @@ func TestGetUserAccessToken(t *testing.T) {
})
t.Run("get my token", func(t *testing.T) {
th := Setup().InitBasic()
th := Setup(t).InitBasic()
defer th.TearDown()
th.App.UpdateConfig(func(cfg *model.Config) { *cfg.ServiceSettings.EnableUserAccessTokens = true })
@@ -3376,7 +3376,7 @@ func TestGetUserAccessToken(t *testing.T) {
})
t.Run("get user token as system admin", func(t *testing.T) {
th := Setup().InitBasic()
th := Setup(t).InitBasic()
defer th.TearDown()
th.App.UpdateConfig(func(cfg *model.Config) { *cfg.ServiceSettings.EnableUserAccessTokens = true })
@@ -3396,7 +3396,7 @@ func TestGetUserAccessToken(t *testing.T) {
})
t.Run("get token for bot created by user", func(t *testing.T) {
th := Setup().InitBasic()
th := Setup(t).InitBasic()
defer th.TearDown()
th.App.UpdateConfig(func(cfg *model.Config) { *cfg.ServiceSettings.EnableUserAccessTokens = true })
@@ -3442,7 +3442,7 @@ func TestGetUserAccessToken(t *testing.T) {
})
t.Run("get token for bot created by another user", func(t *testing.T) {
th := Setup().InitBasic()
th := Setup(t).InitBasic()
defer th.TearDown()
th.App.UpdateConfig(func(cfg *model.Config) { *cfg.ServiceSettings.EnableUserAccessTokens = true })
@@ -3488,7 +3488,7 @@ func TestGetUserAccessToken(t *testing.T) {
func TestGetUserAccessTokensForUser(t *testing.T) {
t.Run("multiple tokens, offset 0, limit 100", func(t *testing.T) {
th := Setup().InitBasic()
th := Setup(t).InitBasic()
defer th.TearDown()
th.App.UpdateConfig(func(cfg *model.Config) { *cfg.ServiceSettings.EnableUserAccessTokens = true })
@@ -3511,7 +3511,7 @@ func TestGetUserAccessTokensForUser(t *testing.T) {
})
t.Run("multiple tokens as system admin, offset 0, limit 100", func(t *testing.T) {
th := Setup().InitBasic()
th := Setup(t).InitBasic()
defer th.TearDown()
th.App.UpdateConfig(func(cfg *model.Config) { *cfg.ServiceSettings.EnableUserAccessTokens = true })
@@ -3534,7 +3534,7 @@ func TestGetUserAccessTokensForUser(t *testing.T) {
})
t.Run("multiple tokens, offset 1, limit 1", func(t *testing.T) {
th := Setup().InitBasic()
th := Setup(t).InitBasic()
defer th.TearDown()
th.App.UpdateConfig(func(cfg *model.Config) { *cfg.ServiceSettings.EnableUserAccessTokens = true })
@@ -3559,7 +3559,7 @@ func TestGetUserAccessTokensForUser(t *testing.T) {
func TestGetUserAccessTokens(t *testing.T) {
t.Run("GetUserAccessTokens, not a system admin", func(t *testing.T) {
th := Setup().InitBasic()
th := Setup(t).InitBasic()
defer th.TearDown()
th.App.UpdateConfig(func(cfg *model.Config) { *cfg.ServiceSettings.EnableUserAccessTokens = true })
@@ -3571,7 +3571,7 @@ func TestGetUserAccessTokens(t *testing.T) {
})
t.Run("GetUserAccessTokens, as a system admin, page 1, perPage 1", func(t *testing.T) {
th := Setup().InitBasic()
th := Setup(t).InitBasic()
defer th.TearDown()
th.App.UpdateConfig(func(cfg *model.Config) { *cfg.ServiceSettings.EnableUserAccessTokens = true })
@@ -3591,7 +3591,7 @@ func TestGetUserAccessTokens(t *testing.T) {
})
t.Run("GetUserAccessTokens, as a system admin, page 0, perPage 2", func(t *testing.T) {
th := Setup().InitBasic()
th := Setup(t).InitBasic()
defer th.TearDown()
th.App.UpdateConfig(func(cfg *model.Config) { *cfg.ServiceSettings.EnableUserAccessTokens = true })
@@ -3612,7 +3612,7 @@ func TestGetUserAccessTokens(t *testing.T) {
}
func TestSearchUserAccessToken(t *testing.T) {
th := Setup().InitBasic()
th := Setup(t).InitBasic()
defer th.TearDown()
testDescription := "test token"
@@ -3649,7 +3649,7 @@ func TestSearchUserAccessToken(t *testing.T) {
func TestRevokeUserAccessToken(t *testing.T) {
t.Run("revoke user token", func(t *testing.T) {
th := Setup().InitBasic()
th := Setup(t).InitBasic()
defer th.TearDown()
th.App.UpdateConfig(func(cfg *model.Config) { *cfg.ServiceSettings.EnableUserAccessTokens = true })
@@ -3667,7 +3667,7 @@ func TestRevokeUserAccessToken(t *testing.T) {
})
t.Run("revoke token belonging to another user", func(t *testing.T) {
th := Setup().InitBasic()
th := Setup(t).InitBasic()
defer th.TearDown()
th.App.UpdateConfig(func(cfg *model.Config) { *cfg.ServiceSettings.EnableUserAccessTokens = true })
@@ -3681,7 +3681,7 @@ func TestRevokeUserAccessToken(t *testing.T) {
})
t.Run("revoke token for bot created by user", func(t *testing.T) {
th := Setup().InitBasic()
th := Setup(t).InitBasic()
defer th.TearDown()
th.App.UpdateConfig(func(cfg *model.Config) { *cfg.ServiceSettings.EnableUserAccessTokens = true })
@@ -3724,7 +3724,7 @@ func TestRevokeUserAccessToken(t *testing.T) {
})
t.Run("revoke token for bot created by another user", func(t *testing.T) {
th := Setup().InitBasic()
th := Setup(t).InitBasic()
defer th.TearDown()
th.App.UpdateConfig(func(cfg *model.Config) { *cfg.ServiceSettings.EnableUserAccessTokens = true })
@@ -3767,7 +3767,7 @@ func TestRevokeUserAccessToken(t *testing.T) {
func TestDisableUserAccessToken(t *testing.T) {
t.Run("disable user token", func(t *testing.T) {
th := Setup().InitBasic()
th := Setup(t).InitBasic()
defer th.TearDown()
th.App.UpdateConfig(func(cfg *model.Config) { *cfg.ServiceSettings.EnableUserAccessTokens = true })
@@ -3785,7 +3785,7 @@ func TestDisableUserAccessToken(t *testing.T) {
})
t.Run("disable token belonging to another user", func(t *testing.T) {
th := Setup().InitBasic()
th := Setup(t).InitBasic()
defer th.TearDown()
th.App.UpdateConfig(func(cfg *model.Config) { *cfg.ServiceSettings.EnableUserAccessTokens = true })
@@ -3799,7 +3799,7 @@ func TestDisableUserAccessToken(t *testing.T) {
})
t.Run("disable token for bot created by user", func(t *testing.T) {
th := Setup().InitBasic()
th := Setup(t).InitBasic()
defer th.TearDown()
th.App.UpdateConfig(func(cfg *model.Config) { *cfg.ServiceSettings.EnableUserAccessTokens = true })
@@ -3842,7 +3842,7 @@ func TestDisableUserAccessToken(t *testing.T) {
})
t.Run("disable token for bot created by another user", func(t *testing.T) {
th := Setup().InitBasic()
th := Setup(t).InitBasic()
defer th.TearDown()
th.App.UpdateConfig(func(cfg *model.Config) { *cfg.ServiceSettings.EnableUserAccessTokens = true })
@@ -3885,7 +3885,7 @@ func TestDisableUserAccessToken(t *testing.T) {
func TestEnableUserAccessToken(t *testing.T) {
t.Run("enable user token", func(t *testing.T) {
th := Setup().InitBasic()
th := Setup(t).InitBasic()
defer th.TearDown()
th.App.UpdateConfig(func(cfg *model.Config) { *cfg.ServiceSettings.EnableUserAccessTokens = true })
@@ -3909,7 +3909,7 @@ func TestEnableUserAccessToken(t *testing.T) {
})
t.Run("enable token belonging to another user", func(t *testing.T) {
th := Setup().InitBasic()
th := Setup(t).InitBasic()
defer th.TearDown()
th.App.UpdateConfig(func(cfg *model.Config) { *cfg.ServiceSettings.EnableUserAccessTokens = true })
@@ -3927,7 +3927,7 @@ func TestEnableUserAccessToken(t *testing.T) {
})
t.Run("enable token for bot created by user", func(t *testing.T) {
th := Setup().InitBasic()
th := Setup(t).InitBasic()
defer th.TearDown()
th.App.UpdateConfig(func(cfg *model.Config) { *cfg.ServiceSettings.EnableUserAccessTokens = true })
@@ -3974,7 +3974,7 @@ func TestEnableUserAccessToken(t *testing.T) {
})
t.Run("enable token for bot created by another user", func(t *testing.T) {
th := Setup().InitBasic()
th := Setup(t).InitBasic()
defer th.TearDown()
th.App.UpdateConfig(func(cfg *model.Config) { *cfg.ServiceSettings.EnableUserAccessTokens = true })
@@ -4020,7 +4020,7 @@ func TestEnableUserAccessToken(t *testing.T) {
}
func TestUserAccessTokenInactiveUser(t *testing.T) {
th := Setup().InitBasic()
th := Setup(t).InitBasic()
defer th.TearDown()
testDescription := "test token"
@@ -4042,7 +4042,7 @@ func TestUserAccessTokenInactiveUser(t *testing.T) {
}
func TestUserAccessTokenDisableConfig(t *testing.T) {
th := Setup().InitBasic()
th := Setup(t).InitBasic()
defer th.TearDown()
testDescription := "test token"
@@ -4069,7 +4069,7 @@ func TestUserAccessTokenDisableConfig(t *testing.T) {
}
func TestUserAccessTokenDisableConfigBotsExcluded(t *testing.T) {
th := Setup().InitBasic()
th := Setup(t).InitBasic()
defer th.TearDown()
th.App.UpdateConfig(func(cfg *model.Config) {
@@ -4093,7 +4093,7 @@ func TestUserAccessTokenDisableConfigBotsExcluded(t *testing.T) {
}
func TestGetUsersByStatus(t *testing.T) {
th := Setup()
th := Setup(t)
defer th.TearDown()
team, err := th.App.CreateTeam(&model.Team{
@@ -4200,7 +4200,7 @@ func TestGetUsersByStatus(t *testing.T) {
}
func TestRegisterTermsOfServiceAction(t *testing.T) {
th := Setup().InitBasic()
th := Setup(t).InitBasic()
defer th.TearDown()
success, resp := th.Client.RegisterTermsOfServiceAction(th.BasicUser.Id, "st_1", true)
@@ -4219,7 +4219,7 @@ func TestRegisterTermsOfServiceAction(t *testing.T) {
}
func TestGetUserTermsOfService(t *testing.T) {
th := Setup().InitBasic()
th := Setup(t).InitBasic()
defer th.TearDown()
_, resp := th.Client.GetUserTermsOfService(th.BasicUser.Id, "")
@@ -4241,7 +4241,7 @@ func TestGetUserTermsOfService(t *testing.T) {
}
func TestLoginErrorMessage(t *testing.T) {
th := Setup().InitBasic()
th := Setup(t).InitBasic()
defer th.TearDown()
_, resp := th.Client.Logout()
@@ -4296,7 +4296,7 @@ func TestLoginErrorMessage(t *testing.T) {
}
func TestLoginLockout(t *testing.T) {
th := Setup().InitBasic()
th := Setup(t).InitBasic()
defer th.TearDown()
_, resp := th.Client.Logout()
@@ -4345,7 +4345,7 @@ func TestLoginLockout(t *testing.T) {
func TestDemoteUserToGuest(t *testing.T) {
t.Run("websocket update user event", func(t *testing.T) {
th := Setup().InitBasic()
th := Setup(t).InitBasic()
th.Server.Store = localcachelayer.NewLocalCacheLayer(th.Server.Store,
th.Server.Metrics, th.Server.Cluster, th.Server.CacheProvider)
defer th.TearDown()
@@ -4400,7 +4400,7 @@ func TestDemoteUserToGuest(t *testing.T) {
func TestPromoteGuestToUser(t *testing.T) {
t.Run("websocket update user event", func(t *testing.T) {
th := Setup().InitBasic()
th := Setup(t).InitBasic()
th.Server.Store = localcachelayer.NewLocalCacheLayer(th.Server.Store,
th.Server.Metrics, th.Server.Cluster, th.Server.CacheProvider)
defer th.TearDown()