MM-57759: Added mockery support for 1.22 (#26774)
* Revert "Revert "MM-57759: Bump mockery to version 2.42.2 to support go 1.22^" (#26772)"
This reverts commit cd3b5b46e1.
* Added the hooks.go file changes as well
```release-note
NONE
```
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
96ab35ba34
Коммит
870cee30c6
@@ -1,4 +1,4 @@
|
||||
// Code generated by mockery v2.23.2. DO NOT EDIT.
|
||||
// Code generated by mockery v2.42.2. DO NOT EDIT.
|
||||
|
||||
// Regenerate this file using `make einterfaces-mocks`.
|
||||
|
||||
@@ -19,6 +19,10 @@ type AccountMigrationInterface struct {
|
||||
func (_m *AccountMigrationInterface) MigrateToLdap(c request.CTX, fromAuthService string, foreignUserFieldNameToMatch string, force bool, dryRun bool) *model.AppError {
|
||||
ret := _m.Called(c, fromAuthService, foreignUserFieldNameToMatch, force, dryRun)
|
||||
|
||||
if len(ret) == 0 {
|
||||
panic("no return value specified for MigrateToLdap")
|
||||
}
|
||||
|
||||
var r0 *model.AppError
|
||||
if rf, ok := ret.Get(0).(func(request.CTX, string, string, bool, bool) *model.AppError); ok {
|
||||
r0 = rf(c, fromAuthService, foreignUserFieldNameToMatch, force, dryRun)
|
||||
@@ -35,6 +39,10 @@ func (_m *AccountMigrationInterface) MigrateToLdap(c request.CTX, fromAuthServic
|
||||
func (_m *AccountMigrationInterface) MigrateToSaml(c request.CTX, fromAuthService string, usersMap map[string]string, auto bool, dryRun bool) *model.AppError {
|
||||
ret := _m.Called(c, fromAuthService, usersMap, auto, dryRun)
|
||||
|
||||
if len(ret) == 0 {
|
||||
panic("no return value specified for MigrateToSaml")
|
||||
}
|
||||
|
||||
var r0 *model.AppError
|
||||
if rf, ok := ret.Get(0).(func(request.CTX, string, map[string]string, bool, bool) *model.AppError); ok {
|
||||
r0 = rf(c, fromAuthService, usersMap, auto, dryRun)
|
||||
@@ -47,13 +55,12 @@ func (_m *AccountMigrationInterface) MigrateToSaml(c request.CTX, fromAuthServic
|
||||
return r0
|
||||
}
|
||||
|
||||
type mockConstructorTestingTNewAccountMigrationInterface interface {
|
||||
// NewAccountMigrationInterface creates a new instance of AccountMigrationInterface. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
|
||||
// The first argument is typically a *testing.T value.
|
||||
func NewAccountMigrationInterface(t interface {
|
||||
mock.TestingT
|
||||
Cleanup(func())
|
||||
}
|
||||
|
||||
// NewAccountMigrationInterface creates a new instance of AccountMigrationInterface. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
|
||||
func NewAccountMigrationInterface(t mockConstructorTestingTNewAccountMigrationInterface) *AccountMigrationInterface {
|
||||
}) *AccountMigrationInterface {
|
||||
mock := &AccountMigrationInterface{}
|
||||
mock.Mock.Test(t)
|
||||
|
||||
|
||||
Ссылка в новой задаче
Block a user