[MM-16751] golint model (#17896)
Этот коммит содержится в:
Ben Schumacher
коммит произвёл
Claudio Costa
Claudio Costa
родитель
953eebdef4
Коммит
97ccf0bdf6
@@ -38,7 +38,7 @@ func TestCreateOAuthUser(t *testing.T) {
|
||||
glUser := oauthgitlab.GitLabUser{Id: 42, Username: "o" + model.NewId(), Email: model.NewId() + "@simulator.amazonses.com", Name: "Joram Wilander"}
|
||||
json := glUser.ToJson()
|
||||
|
||||
user, err := th.App.CreateOAuthUser(th.Context, model.USER_AUTH_SERVICE_GITLAB, strings.NewReader(json), th.BasicTeam.Id, nil)
|
||||
user, err := th.App.CreateOAuthUser(th.Context, model.UserAuthServiceGitlab, strings.NewReader(json), th.BasicTeam.Id, nil)
|
||||
require.Nil(t, err)
|
||||
|
||||
require.Equal(t, glUser.Username, user.Username, "usernames didn't match")
|
||||
@@ -55,18 +55,18 @@ func TestCreateOAuthUser(t *testing.T) {
|
||||
|
||||
// mock oAuth Provider, return data
|
||||
mockUser := &model.User{Id: "abcdef", AuthData: model.NewString("e7110007-64be-43d8-9840-4a7e9c26b710"), Email: dbUser.Email}
|
||||
providerMock := &mocks.OauthProvider{}
|
||||
providerMock := &mocks.OAuthProvider{}
|
||||
providerMock.On("IsSameUser", mock.Anything, mock.Anything).Return(true)
|
||||
providerMock.On("GetUserFromJson", mock.Anything, mock.Anything).Return(mockUser, nil)
|
||||
einterfaces.RegisterOauthProvider(model.SERVICE_OFFICE365, providerMock)
|
||||
einterfaces.RegisterOAuthProvider(model.ServiceOffice365, providerMock)
|
||||
|
||||
// Update user to be OAuth, formatting to match Office365 OAuth data
|
||||
s, er2 := th.App.Srv().Store.User().UpdateAuthData(dbUser.Id, model.SERVICE_OFFICE365, model.NewString("e711000764be43d898404a7e9c26b710"), "", false)
|
||||
s, er2 := th.App.Srv().Store.User().UpdateAuthData(dbUser.Id, model.ServiceOffice365, model.NewString("e711000764be43d898404a7e9c26b710"), "", false)
|
||||
assert.NoError(t, er2)
|
||||
assert.Equal(t, dbUser.Id, s)
|
||||
|
||||
// data passed doesn't matter as return is mocked
|
||||
_, err := th.App.CreateOAuthUser(th.Context, model.SERVICE_OFFICE365, strings.NewReader("{}"), th.BasicTeam.Id, nil)
|
||||
_, err := th.App.CreateOAuthUser(th.Context, model.ServiceOffice365, strings.NewReader("{}"), th.BasicTeam.Id, nil)
|
||||
assert.Nil(t, err)
|
||||
u, er := th.App.Srv().Store.User().GetByEmail(dbUser.Email)
|
||||
assert.NoError(t, er)
|
||||
@@ -76,7 +76,7 @@ func TestCreateOAuthUser(t *testing.T) {
|
||||
|
||||
t.Run("user creation disabled", func(t *testing.T) {
|
||||
*th.App.Config().TeamSettings.EnableUserCreation = false
|
||||
_, err := th.App.CreateOAuthUser(th.Context, model.USER_AUTH_SERVICE_GITLAB, strings.NewReader("{}"), th.BasicTeam.Id, nil)
|
||||
_, err := th.App.CreateOAuthUser(th.Context, model.UserAuthServiceGitlab, strings.NewReader("{}"), th.BasicTeam.Id, nil)
|
||||
require.NotNil(t, err, "should have failed - user creation disabled")
|
||||
})
|
||||
}
|
||||
@@ -249,7 +249,7 @@ func TestUpdateOAuthUserAttrs(t *testing.T) {
|
||||
th.App.UpdateConfig(func(cfg *model.Config) {
|
||||
*cfg.GitLabSettings.Enable = true
|
||||
})
|
||||
gitlabProvider := einterfaces.GetOauthProvider("gitlab")
|
||||
gitlabProvider := einterfaces.GetOAuthProvider("gitlab")
|
||||
|
||||
username := "user" + id
|
||||
username2 := "user" + id2
|
||||
@@ -568,7 +568,7 @@ func TestGetUsersByStatus(t *testing.T) {
|
||||
channel, err := th.App.CreateChannel(th.Context, &model.Channel{
|
||||
DisplayName: "dn_" + model.NewId(),
|
||||
Name: "name_" + model.NewId(),
|
||||
Type: model.CHANNEL_OPEN,
|
||||
Type: model.ChannelTypeOpen,
|
||||
TeamId: team.Id,
|
||||
CreatorId: model.NewId(),
|
||||
}, false)
|
||||
@@ -598,14 +598,14 @@ func TestGetUsersByStatus(t *testing.T) {
|
||||
}
|
||||
|
||||
// Creating these out of order in case that affects results
|
||||
awayUser1 := createUserWithStatus("away1", model.STATUS_AWAY)
|
||||
awayUser2 := createUserWithStatus("away2", model.STATUS_AWAY)
|
||||
dndUser1 := createUserWithStatus("dnd1", model.STATUS_DND)
|
||||
dndUser2 := createUserWithStatus("dnd2", model.STATUS_DND)
|
||||
offlineUser1 := createUserWithStatus("offline1", model.STATUS_OFFLINE)
|
||||
offlineUser2 := createUserWithStatus("offline2", model.STATUS_OFFLINE)
|
||||
onlineUser1 := createUserWithStatus("online1", model.STATUS_ONLINE)
|
||||
onlineUser2 := createUserWithStatus("online2", model.STATUS_ONLINE)
|
||||
awayUser1 := createUserWithStatus("away1", model.StatusAway)
|
||||
awayUser2 := createUserWithStatus("away2", model.StatusAway)
|
||||
dndUser1 := createUserWithStatus("dnd1", model.StatusDnd)
|
||||
dndUser2 := createUserWithStatus("dnd2", model.StatusDnd)
|
||||
offlineUser1 := createUserWithStatus("offline1", model.StatusOffline)
|
||||
offlineUser2 := createUserWithStatus("offline2", model.StatusOffline)
|
||||
onlineUser1 := createUserWithStatus("online1", model.StatusOnline)
|
||||
onlineUser2 := createUserWithStatus("online2", model.StatusOnline)
|
||||
|
||||
t.Run("sorting by status then alphabetical", func(t *testing.T) {
|
||||
usersByStatus, err := th.App.GetUsersInChannelPageByStatus(&model.UserGetOptions{
|
||||
@@ -1036,15 +1036,15 @@ func TestGetViewUsersRestrictions(t *testing.T) {
|
||||
})
|
||||
|
||||
t.Run("VIEW_MEMBERS permission granted at team level", func(t *testing.T) {
|
||||
systemUserRole, err := th.App.GetRoleByName(context.Background(), model.SYSTEM_USER_ROLE_ID)
|
||||
systemUserRole, err := th.App.GetRoleByName(context.Background(), model.SystemUserRoleId)
|
||||
require.Nil(t, err)
|
||||
teamUserRole, err := th.App.GetRoleByName(context.Background(), model.TEAM_USER_ROLE_ID)
|
||||
teamUserRole, err := th.App.GetRoleByName(context.Background(), model.TeamUserRoleId)
|
||||
require.Nil(t, err)
|
||||
|
||||
require.Nil(t, removePermission(systemUserRole, model.PERMISSION_VIEW_MEMBERS.Id))
|
||||
defer addPermission(systemUserRole, model.PERMISSION_VIEW_MEMBERS.Id)
|
||||
require.Nil(t, addPermission(teamUserRole, model.PERMISSION_VIEW_MEMBERS.Id))
|
||||
defer removePermission(teamUserRole, model.PERMISSION_VIEW_MEMBERS.Id)
|
||||
require.Nil(t, removePermission(systemUserRole, model.PermissionViewMembers.Id))
|
||||
defer addPermission(systemUserRole, model.PermissionViewMembers.Id)
|
||||
require.Nil(t, addPermission(teamUserRole, model.PermissionViewMembers.Id))
|
||||
defer removePermission(teamUserRole, model.PermissionViewMembers.Id)
|
||||
|
||||
restrictions, err := th.App.GetViewUsersRestrictions(user1.Id)
|
||||
require.Nil(t, err)
|
||||
@@ -1057,10 +1057,10 @@ func TestGetViewUsersRestrictions(t *testing.T) {
|
||||
})
|
||||
|
||||
t.Run("VIEW_MEMBERS permission not granted at any level", func(t *testing.T) {
|
||||
systemUserRole, err := th.App.GetRoleByName(context.Background(), model.SYSTEM_USER_ROLE_ID)
|
||||
systemUserRole, err := th.App.GetRoleByName(context.Background(), model.SystemUserRoleId)
|
||||
require.Nil(t, err)
|
||||
require.Nil(t, removePermission(systemUserRole, model.PERMISSION_VIEW_MEMBERS.Id))
|
||||
defer addPermission(systemUserRole, model.PERMISSION_VIEW_MEMBERS.Id)
|
||||
require.Nil(t, removePermission(systemUserRole, model.PermissionViewMembers.Id))
|
||||
defer addPermission(systemUserRole, model.PermissionViewMembers.Id)
|
||||
|
||||
restrictions, err := th.App.GetViewUsersRestrictions(user1.Id)
|
||||
require.Nil(t, err)
|
||||
@@ -1072,15 +1072,15 @@ func TestGetViewUsersRestrictions(t *testing.T) {
|
||||
})
|
||||
|
||||
t.Run("VIEW_MEMBERS permission for some teams but not for others", func(t *testing.T) {
|
||||
systemUserRole, err := th.App.GetRoleByName(context.Background(), model.SYSTEM_USER_ROLE_ID)
|
||||
systemUserRole, err := th.App.GetRoleByName(context.Background(), model.SystemUserRoleId)
|
||||
require.Nil(t, err)
|
||||
teamAdminRole, err := th.App.GetRoleByName(context.Background(), model.TEAM_ADMIN_ROLE_ID)
|
||||
teamAdminRole, err := th.App.GetRoleByName(context.Background(), model.TeamAdminRoleId)
|
||||
require.Nil(t, err)
|
||||
|
||||
require.Nil(t, removePermission(systemUserRole, model.PERMISSION_VIEW_MEMBERS.Id))
|
||||
defer addPermission(systemUserRole, model.PERMISSION_VIEW_MEMBERS.Id)
|
||||
require.Nil(t, addPermission(teamAdminRole, model.PERMISSION_VIEW_MEMBERS.Id))
|
||||
defer removePermission(teamAdminRole, model.PERMISSION_VIEW_MEMBERS.Id)
|
||||
require.Nil(t, removePermission(systemUserRole, model.PermissionViewMembers.Id))
|
||||
defer addPermission(systemUserRole, model.PermissionViewMembers.Id)
|
||||
require.Nil(t, addPermission(teamAdminRole, model.PermissionViewMembers.Id))
|
||||
defer removePermission(teamAdminRole, model.PermissionViewMembers.Id)
|
||||
|
||||
restrictions, err := th.App.GetViewUsersRestrictions(user1.Id)
|
||||
require.Nil(t, err)
|
||||
@@ -1444,12 +1444,12 @@ func TestUpdateUserRolesWithUser(t *testing.T) {
|
||||
|
||||
// Create normal user.
|
||||
user := th.CreateUser()
|
||||
assert.Equal(t, user.Roles, model.SYSTEM_USER_ROLE_ID)
|
||||
assert.Equal(t, user.Roles, model.SystemUserRoleId)
|
||||
|
||||
// Upgrade to sysadmin.
|
||||
user, err := th.App.UpdateUserRolesWithUser(user, model.SYSTEM_USER_ROLE_ID+" "+model.SYSTEM_ADMIN_ROLE_ID, false)
|
||||
user, err := th.App.UpdateUserRolesWithUser(user, model.SystemUserRoleId+" "+model.SystemAdminRoleId, false)
|
||||
require.Nil(t, err)
|
||||
assert.Equal(t, user.Roles, model.SYSTEM_USER_ROLE_ID+" "+model.SYSTEM_ADMIN_ROLE_ID)
|
||||
assert.Equal(t, user.Roles, model.SystemUserRoleId+" "+model.SystemAdminRoleId)
|
||||
|
||||
// Test bad role.
|
||||
_, err = th.App.UpdateUserRolesWithUser(user, "does not exist", false)
|
||||
@@ -1512,7 +1512,7 @@ func TestUpdateThreadReadForUser(t *testing.T) {
|
||||
defer th.TearDown()
|
||||
th.App.UpdateConfig(func(cfg *model.Config) {
|
||||
*cfg.ServiceSettings.ThreadAutoFollow = true
|
||||
*cfg.ServiceSettings.CollapsedThreads = model.COLLAPSED_THREADS_DEFAULT_ON
|
||||
*cfg.ServiceSettings.CollapsedThreads = model.CollapsedThreadsDefaultOn
|
||||
})
|
||||
|
||||
t.Run("Ensure thread membership is created and followed", func(t *testing.T) {
|
||||
|
||||
Ссылка в новой задаче
Block a user