Fix initialism errors (PR-2) (#17032)
* Fix initialism errors * Fix check-mocks test * Revert mlog and filestore packages * Update plugin_hooks_test.go * Update opentracinglayer.go * Regenerate mocks and check store layers * Revert plugin's context changes * Update context.go * Update plugin_requests.go * Update plugin_hooks_test.go * Regenerate mocks * Regenerate mocks and store layers Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
db01f2a91b
Коммит
343c51830f
@@ -14,7 +14,7 @@ type LdapInterface interface {
|
||||
CheckPassword(id string, password string) *model.AppError
|
||||
CheckPasswordAuthData(authData string, password string) *model.AppError
|
||||
CheckProviderAttributes(LS *model.LdapSettings, ouser *model.User, patch *model.UserPatch) string
|
||||
SwitchToLdap(userId, ldapId, ldapPassword string) *model.AppError
|
||||
SwitchToLdap(userID, ldapID, ldapPassword string) *model.AppError
|
||||
StartSynchronizeJob(waitForJobToFinish bool) (*model.Job, *model.AppError)
|
||||
RunTest() *model.AppError
|
||||
GetAllLdapUsers() ([]*model.User, *model.AppError)
|
||||
|
||||
@@ -10,6 +10,6 @@ import (
|
||||
type MfaInterface interface {
|
||||
GenerateSecret(user *model.User) (string, []byte, *model.AppError)
|
||||
Activate(user *model.User, token string) *model.AppError
|
||||
Deactivate(userId string) *model.AppError
|
||||
Deactivate(userID string) *model.AppError
|
||||
ValidateToken(secret, token string) (bool, *model.AppError)
|
||||
}
|
||||
|
||||
@@ -323,13 +323,13 @@ func (_m *LdapInterface) StartSynchronizeJob(waitForJobToFinish bool) (*model.Jo
|
||||
return r0, r1
|
||||
}
|
||||
|
||||
// SwitchToLdap provides a mock function with given fields: userId, ldapId, ldapPassword
|
||||
func (_m *LdapInterface) SwitchToLdap(userId string, ldapId string, ldapPassword string) *model.AppError {
|
||||
ret := _m.Called(userId, ldapId, ldapPassword)
|
||||
// SwitchToLdap provides a mock function with given fields: userID, ldapID, ldapPassword
|
||||
func (_m *LdapInterface) SwitchToLdap(userID string, ldapID string, ldapPassword string) *model.AppError {
|
||||
ret := _m.Called(userID, ldapID, ldapPassword)
|
||||
|
||||
var r0 *model.AppError
|
||||
if rf, ok := ret.Get(0).(func(string, string, string) *model.AppError); ok {
|
||||
r0 = rf(userId, ldapId, ldapPassword)
|
||||
r0 = rf(userID, ldapID, ldapPassword)
|
||||
} else {
|
||||
if ret.Get(0) != nil {
|
||||
r0 = ret.Get(0).(*model.AppError)
|
||||
|
||||
@@ -30,13 +30,13 @@ func (_m *MfaInterface) Activate(user *model.User, token string) *model.AppError
|
||||
return r0
|
||||
}
|
||||
|
||||
// Deactivate provides a mock function with given fields: userId
|
||||
func (_m *MfaInterface) Deactivate(userId string) *model.AppError {
|
||||
ret := _m.Called(userId)
|
||||
// Deactivate provides a mock function with given fields: userID
|
||||
func (_m *MfaInterface) Deactivate(userID string) *model.AppError {
|
||||
ret := _m.Called(userID)
|
||||
|
||||
var r0 *model.AppError
|
||||
if rf, ok := ret.Get(0).(func(string) *model.AppError); ok {
|
||||
r0 = rf(userId)
|
||||
r0 = rf(userID)
|
||||
} else {
|
||||
if ret.Get(0) != nil {
|
||||
r0 = ret.Get(0).(*model.AppError)
|
||||
|
||||
@@ -30,13 +30,13 @@ func (_m *NotificationInterface) CheckLicense() *model.AppError {
|
||||
return r0
|
||||
}
|
||||
|
||||
// GetNotificationMessage provides a mock function with given fields: ack, userId
|
||||
func (_m *NotificationInterface) GetNotificationMessage(ack *model.PushNotificationAck, userId string) (*model.PushNotification, *model.AppError) {
|
||||
ret := _m.Called(ack, userId)
|
||||
// GetNotificationMessage provides a mock function with given fields: ack, userID
|
||||
func (_m *NotificationInterface) GetNotificationMessage(ack *model.PushNotificationAck, userID string) (*model.PushNotification, *model.AppError) {
|
||||
ret := _m.Called(ack, userID)
|
||||
|
||||
var r0 *model.PushNotification
|
||||
if rf, ok := ret.Get(0).(func(*model.PushNotificationAck, string) *model.PushNotification); ok {
|
||||
r0 = rf(ack, userId)
|
||||
r0 = rf(ack, userID)
|
||||
} else {
|
||||
if ret.Get(0) != nil {
|
||||
r0 = ret.Get(0).(*model.PushNotification)
|
||||
@@ -45,7 +45,7 @@ func (_m *NotificationInterface) GetNotificationMessage(ack *model.PushNotificat
|
||||
|
||||
var r1 *model.AppError
|
||||
if rf, ok := ret.Get(1).(func(*model.PushNotificationAck, string) *model.AppError); ok {
|
||||
r1 = rf(ack, userId)
|
||||
r1 = rf(ack, userID)
|
||||
} else {
|
||||
if ret.Get(1) != nil {
|
||||
r1 = ret.Get(1).(*model.AppError)
|
||||
|
||||
@@ -8,6 +8,6 @@ import (
|
||||
)
|
||||
|
||||
type NotificationInterface interface {
|
||||
GetNotificationMessage(ack *model.PushNotificationAck, userId string) (*model.PushNotification, *model.AppError)
|
||||
GetNotificationMessage(ack *model.PushNotificationAck, userID string) (*model.PushNotification, *model.AppError)
|
||||
CheckLicense() *model.AppError
|
||||
}
|
||||
|
||||
Ссылка в новой задаче
Block a user