[MM-16751] golint model (#17896)
Этот коммит содержится в:
Ben Schumacher
коммит произвёл
Claudio Costa
Claudio Costa
родитель
953eebdef4
Коммит
97ccf0bdf6
@@ -261,7 +261,7 @@ func SetupConfigWithStoreMock(tb testing.TB, updateConfig func(cfg *model.Config
|
||||
th := setupTestHelper(testlib.GetMockStoreForSetupFunctions(), nil, false, false, updateConfig, nil)
|
||||
statusMock := mocks.StatusStore{}
|
||||
statusMock.On("UpdateExpiredDNDStatuses").Return([]*model.Status{}, nil)
|
||||
statusMock.On("Get", "user1").Return(&model.Status{UserId: "user1", Status: model.STATUS_ONLINE}, nil)
|
||||
statusMock.On("Get", "user1").Return(&model.Status{UserId: "user1", Status: model.StatusOnline}, nil)
|
||||
statusMock.On("UpdateLastActivityAt", "user1", mock.Anything).Return(nil)
|
||||
statusMock.On("SaveOrUpdate", mock.AnythingOfType("*model.Status")).Return(nil)
|
||||
emptyMockStore := mocks.Store{}
|
||||
@@ -275,7 +275,7 @@ func SetupWithStoreMock(tb testing.TB) *TestHelper {
|
||||
th := setupTestHelper(testlib.GetMockStoreForSetupFunctions(), nil, false, false, nil, nil)
|
||||
statusMock := mocks.StatusStore{}
|
||||
statusMock.On("UpdateExpiredDNDStatuses").Return([]*model.Status{}, nil)
|
||||
statusMock.On("Get", "user1").Return(&model.Status{UserId: "user1", Status: model.STATUS_ONLINE}, nil)
|
||||
statusMock.On("Get", "user1").Return(&model.Status{UserId: "user1", Status: model.StatusOnline}, nil)
|
||||
statusMock.On("UpdateLastActivityAt", "user1", mock.Anything).Return(nil)
|
||||
statusMock.On("SaveOrUpdate", mock.AnythingOfType("*model.Status")).Return(nil)
|
||||
emptyMockStore := mocks.Store{}
|
||||
@@ -289,7 +289,7 @@ func SetupEnterpriseWithStoreMock(tb testing.TB) *TestHelper {
|
||||
th := setupTestHelper(testlib.GetMockStoreForSetupFunctions(), nil, true, false, nil, nil)
|
||||
statusMock := mocks.StatusStore{}
|
||||
statusMock.On("UpdateExpiredDNDStatuses").Return([]*model.Status{}, nil)
|
||||
statusMock.On("Get", "user1").Return(&model.Status{UserId: "user1", Status: model.STATUS_ONLINE}, nil)
|
||||
statusMock.On("Get", "user1").Return(&model.Status{UserId: "user1", Status: model.StatusOnline}, nil)
|
||||
statusMock.On("UpdateLastActivityAt", "user1", mock.Anything).Return(nil)
|
||||
statusMock.On("SaveOrUpdate", mock.AnythingOfType("*model.Status")).Return(nil)
|
||||
emptyMockStore := mocks.Store{}
|
||||
@@ -361,17 +361,17 @@ func (th *TestHelper) InitLogin() *TestHelper {
|
||||
// create users once and cache them because password hashing is slow
|
||||
initBasicOnce.Do(func() {
|
||||
th.SystemAdminUser = th.CreateUser()
|
||||
th.App.UpdateUserRoles(th.SystemAdminUser.Id, model.SYSTEM_USER_ROLE_ID+" "+model.SYSTEM_ADMIN_ROLE_ID, false)
|
||||
th.App.UpdateUserRoles(th.SystemAdminUser.Id, model.SystemUserRoleId+" "+model.SystemAdminRoleId, false)
|
||||
th.SystemAdminUser, _ = th.App.GetUser(th.SystemAdminUser.Id)
|
||||
userCache.SystemAdminUser = th.SystemAdminUser.DeepCopy()
|
||||
|
||||
th.SystemManagerUser = th.CreateUser()
|
||||
th.App.UpdateUserRoles(th.SystemManagerUser.Id, model.SYSTEM_USER_ROLE_ID+" "+model.SYSTEM_MANAGER_ROLE_ID, false)
|
||||
th.App.UpdateUserRoles(th.SystemManagerUser.Id, model.SystemUserRoleId+" "+model.SystemManagerRoleId, false)
|
||||
th.SystemManagerUser, _ = th.App.GetUser(th.SystemManagerUser.Id)
|
||||
userCache.SystemManagerUser = th.SystemManagerUser.DeepCopy()
|
||||
|
||||
th.TeamAdminUser = th.CreateUser()
|
||||
th.App.UpdateUserRoles(th.TeamAdminUser.Id, model.SYSTEM_USER_ROLE_ID, false)
|
||||
th.App.UpdateUserRoles(th.TeamAdminUser.Id, model.SystemUserRoleId, false)
|
||||
th.TeamAdminUser, _ = th.App.GetUser(th.TeamAdminUser.Id)
|
||||
userCache.TeamAdminUser = th.TeamAdminUser.DeepCopy()
|
||||
|
||||
@@ -433,7 +433,7 @@ func (th *TestHelper) InitBasic() *TestHelper {
|
||||
th.App.AddUserToChannel(th.BasicUser2, th.BasicPrivateChannel, false)
|
||||
th.App.AddUserToChannel(th.BasicUser, th.BasicDeletedChannel, false)
|
||||
th.App.AddUserToChannel(th.BasicUser2, th.BasicDeletedChannel, false)
|
||||
th.App.UpdateUserRoles(th.BasicUser.Id, model.SYSTEM_USER_ROLE_ID, false)
|
||||
th.App.UpdateUserRoles(th.BasicUser.Id, model.SystemUserRoleId, false)
|
||||
th.Client.DeleteChannel(th.BasicDeletedChannel.Id)
|
||||
th.LoginBasic()
|
||||
th.Group = th.CreateGroup()
|
||||
@@ -468,7 +468,7 @@ func (th *TestHelper) CreateLocalClient(socketPath string) *model.Client4 {
|
||||
}
|
||||
|
||||
return &model.Client4{
|
||||
ApiUrl: "http://_" + model.API_URL_SUFFIX,
|
||||
ApiUrl: "http://_" + model.ApiUrlSuffix,
|
||||
HttpClient: httpClient,
|
||||
}
|
||||
}
|
||||
@@ -523,7 +523,7 @@ func (th *TestHelper) CreateTeamWithClient(client *model.Client4) *model.Team {
|
||||
DisplayName: "dn_" + id,
|
||||
Name: GenerateTestTeamName(),
|
||||
Email: th.GenerateTestEmail(),
|
||||
Type: model.TEAM_OPEN,
|
||||
Type: model.TeamOpen,
|
||||
}
|
||||
|
||||
utils.DisableDebugLogForTest()
|
||||
@@ -622,18 +622,18 @@ func (th *TestHelper) SetupSamlConfig() {
|
||||
*cfg.SamlSettings.NicknameAttribute = ""
|
||||
*cfg.SamlSettings.PositionAttribute = ""
|
||||
*cfg.SamlSettings.LocaleAttribute = ""
|
||||
*cfg.SamlSettings.SignatureAlgorithm = model.SAML_SETTINGS_SIGNATURE_ALGORITHM_SHA256
|
||||
*cfg.SamlSettings.CanonicalAlgorithm = model.SAML_SETTINGS_CANONICAL_ALGORITHM_C14N11
|
||||
*cfg.SamlSettings.SignatureAlgorithm = model.SamlSettingsSignatureAlgorithmSha256
|
||||
*cfg.SamlSettings.CanonicalAlgorithm = model.SamlSettingsCanonicalAlgorithmC14n11
|
||||
})
|
||||
th.App.Srv().SetLicense(model.NewTestLicense("saml"))
|
||||
}
|
||||
|
||||
func (th *TestHelper) CreatePublicChannel() *model.Channel {
|
||||
return th.CreateChannelWithClient(th.Client, model.CHANNEL_OPEN)
|
||||
return th.CreateChannelWithClient(th.Client, model.ChannelTypeOpen)
|
||||
}
|
||||
|
||||
func (th *TestHelper) CreatePrivateChannel() *model.Channel {
|
||||
return th.CreateChannelWithClient(th.Client, model.CHANNEL_PRIVATE)
|
||||
return th.CreateChannelWithClient(th.Client, model.ChannelTypePrivate)
|
||||
}
|
||||
|
||||
func (th *TestHelper) CreateChannelWithClient(client *model.Client4, channelType string) *model.Channel {
|
||||
@@ -1049,7 +1049,7 @@ func s3New(endpoint, accessKey, secretKey string, secure bool, signV2 bool, regi
|
||||
|
||||
func (th *TestHelper) cleanupTestFile(info *model.FileInfo) error {
|
||||
cfg := th.App.Config()
|
||||
if *cfg.FileSettings.DriverName == model.IMAGE_DRIVER_S3 {
|
||||
if *cfg.FileSettings.DriverName == model.ImageDriverS3 {
|
||||
endpoint := *cfg.FileSettings.AmazonS3Endpoint
|
||||
accessKey := *cfg.FileSettings.AmazonS3AccessKeyId
|
||||
secretKey := *cfg.FileSettings.AmazonS3SecretAccessKey
|
||||
@@ -1076,7 +1076,7 @@ func (th *TestHelper) cleanupTestFile(info *model.FileInfo) error {
|
||||
return err
|
||||
}
|
||||
}
|
||||
} else if *cfg.FileSettings.DriverName == model.IMAGE_DRIVER_LOCAL {
|
||||
} else if *cfg.FileSettings.DriverName == model.ImageDriverLocal {
|
||||
if err := os.Remove(*cfg.FileSettings.Directory + info.Path); err != nil {
|
||||
return err
|
||||
}
|
||||
@@ -1260,11 +1260,11 @@ func (th *TestHelper) AddPermissionToRole(permission string, roleName string) {
|
||||
}
|
||||
|
||||
func (th *TestHelper) SetupTeamScheme() *model.Scheme {
|
||||
return th.SetupScheme(model.SCHEME_SCOPE_TEAM)
|
||||
return th.SetupScheme(model.SchemeScopeTeam)
|
||||
}
|
||||
|
||||
func (th *TestHelper) SetupChannelScheme() *model.Scheme {
|
||||
return th.SetupScheme(model.SCHEME_SCOPE_CHANNEL)
|
||||
return th.SetupScheme(model.SchemeScopeChannel)
|
||||
}
|
||||
|
||||
func (th *TestHelper) SetupScheme(scope string) *model.Scheme {
|
||||
|
||||
Ссылка в новой задаче
Block a user