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`.
|
||||
|
||||
@@ -22,6 +22,10 @@ type OAuthProvider struct {
|
||||
func (_m *OAuthProvider) GetSSOSettings(c request.CTX, config *model.Config, service string) (*model.SSOSettings, error) {
|
||||
ret := _m.Called(c, config, service)
|
||||
|
||||
if len(ret) == 0 {
|
||||
panic("no return value specified for GetSSOSettings")
|
||||
}
|
||||
|
||||
var r0 *model.SSOSettings
|
||||
var r1 error
|
||||
if rf, ok := ret.Get(0).(func(request.CTX, *model.Config, string) (*model.SSOSettings, error)); ok {
|
||||
@@ -48,6 +52,10 @@ func (_m *OAuthProvider) GetSSOSettings(c request.CTX, config *model.Config, ser
|
||||
func (_m *OAuthProvider) GetUserFromIdToken(c request.CTX, idToken string) (*model.User, error) {
|
||||
ret := _m.Called(c, idToken)
|
||||
|
||||
if len(ret) == 0 {
|
||||
panic("no return value specified for GetUserFromIdToken")
|
||||
}
|
||||
|
||||
var r0 *model.User
|
||||
var r1 error
|
||||
if rf, ok := ret.Get(0).(func(request.CTX, string) (*model.User, error)); ok {
|
||||
@@ -74,6 +82,10 @@ func (_m *OAuthProvider) GetUserFromIdToken(c request.CTX, idToken string) (*mod
|
||||
func (_m *OAuthProvider) GetUserFromJSON(c request.CTX, data io.Reader, tokenUser *model.User) (*model.User, error) {
|
||||
ret := _m.Called(c, data, tokenUser)
|
||||
|
||||
if len(ret) == 0 {
|
||||
panic("no return value specified for GetUserFromJSON")
|
||||
}
|
||||
|
||||
var r0 *model.User
|
||||
var r1 error
|
||||
if rf, ok := ret.Get(0).(func(request.CTX, io.Reader, *model.User) (*model.User, error)); ok {
|
||||
@@ -100,6 +112,10 @@ func (_m *OAuthProvider) GetUserFromJSON(c request.CTX, data io.Reader, tokenUse
|
||||
func (_m *OAuthProvider) IsSameUser(c request.CTX, dbUser *model.User, oAuthUser *model.User) bool {
|
||||
ret := _m.Called(c, dbUser, oAuthUser)
|
||||
|
||||
if len(ret) == 0 {
|
||||
panic("no return value specified for IsSameUser")
|
||||
}
|
||||
|
||||
var r0 bool
|
||||
if rf, ok := ret.Get(0).(func(request.CTX, *model.User, *model.User) bool); ok {
|
||||
r0 = rf(c, dbUser, oAuthUser)
|
||||
@@ -110,13 +126,12 @@ func (_m *OAuthProvider) IsSameUser(c request.CTX, dbUser *model.User, oAuthUser
|
||||
return r0
|
||||
}
|
||||
|
||||
type mockConstructorTestingTNewOAuthProvider interface {
|
||||
// NewOAuthProvider creates a new instance of OAuthProvider. 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 NewOAuthProvider(t interface {
|
||||
mock.TestingT
|
||||
Cleanup(func())
|
||||
}
|
||||
|
||||
// NewOAuthProvider creates a new instance of OAuthProvider. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
|
||||
func NewOAuthProvider(t mockConstructorTestingTNewOAuthProvider) *OAuthProvider {
|
||||
}) *OAuthProvider {
|
||||
mock := &OAuthProvider{}
|
||||
mock.Mock.Test(t)
|
||||
|
||||
|
||||
Ссылка в новой задаче
Block a user