Upgrade mockery to fix errors (#22892)
Mockery started to throw errors like "Unexpected package creation during export data loading". This was consistently reproducible locally and on upgrade, it has gone away. ```release-note NONE ```
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
6be0ed0d19
Коммит
bcf115e315
@@ -1,4 +1,4 @@
|
||||
// Code generated by mockery v2.10.4. DO NOT EDIT.
|
||||
// Code generated by mockery v2.23.2. DO NOT EDIT.
|
||||
|
||||
// Regenerate this file using `make einterfaces-mocks`.
|
||||
|
||||
@@ -20,6 +20,10 @@ func (_m *SamlInterface) BuildRequest(relayState string) (*model.SamlAuthRequest
|
||||
ret := _m.Called(relayState)
|
||||
|
||||
var r0 *model.SamlAuthRequest
|
||||
var r1 *model.AppError
|
||||
if rf, ok := ret.Get(0).(func(string) (*model.SamlAuthRequest, *model.AppError)); ok {
|
||||
return rf(relayState)
|
||||
}
|
||||
if rf, ok := ret.Get(0).(func(string) *model.SamlAuthRequest); ok {
|
||||
r0 = rf(relayState)
|
||||
} else {
|
||||
@@ -28,7 +32,6 @@ func (_m *SamlInterface) BuildRequest(relayState string) (*model.SamlAuthRequest
|
||||
}
|
||||
}
|
||||
|
||||
var r1 *model.AppError
|
||||
if rf, ok := ret.Get(1).(func(string) *model.AppError); ok {
|
||||
r1 = rf(relayState)
|
||||
} else {
|
||||
@@ -73,6 +76,10 @@ func (_m *SamlInterface) DoLogin(c *request.Context, encodedXML string, relaySta
|
||||
ret := _m.Called(c, encodedXML, relayState)
|
||||
|
||||
var r0 *model.User
|
||||
var r1 *model.AppError
|
||||
if rf, ok := ret.Get(0).(func(*request.Context, string, map[string]string) (*model.User, *model.AppError)); ok {
|
||||
return rf(c, encodedXML, relayState)
|
||||
}
|
||||
if rf, ok := ret.Get(0).(func(*request.Context, string, map[string]string) *model.User); ok {
|
||||
r0 = rf(c, encodedXML, relayState)
|
||||
} else {
|
||||
@@ -81,7 +88,6 @@ func (_m *SamlInterface) DoLogin(c *request.Context, encodedXML string, relaySta
|
||||
}
|
||||
}
|
||||
|
||||
var r1 *model.AppError
|
||||
if rf, ok := ret.Get(1).(func(*request.Context, string, map[string]string) *model.AppError); ok {
|
||||
r1 = rf(c, encodedXML, relayState)
|
||||
} else {
|
||||
@@ -98,13 +104,16 @@ func (_m *SamlInterface) GetMetadata() (string, *model.AppError) {
|
||||
ret := _m.Called()
|
||||
|
||||
var r0 string
|
||||
var r1 *model.AppError
|
||||
if rf, ok := ret.Get(0).(func() (string, *model.AppError)); ok {
|
||||
return rf()
|
||||
}
|
||||
if rf, ok := ret.Get(0).(func() string); ok {
|
||||
r0 = rf()
|
||||
} else {
|
||||
r0 = ret.Get(0).(string)
|
||||
}
|
||||
|
||||
var r1 *model.AppError
|
||||
if rf, ok := ret.Get(1).(func() *model.AppError); ok {
|
||||
r1 = rf()
|
||||
} else {
|
||||
@@ -115,3 +124,18 @@ func (_m *SamlInterface) GetMetadata() (string, *model.AppError) {
|
||||
|
||||
return r0, r1
|
||||
}
|
||||
|
||||
type mockConstructorTestingTNewSamlInterface interface {
|
||||
mock.TestingT
|
||||
Cleanup(func())
|
||||
}
|
||||
|
||||
// NewSamlInterface creates a new instance of SamlInterface. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
|
||||
func NewSamlInterface(t mockConstructorTestingTNewSamlInterface) *SamlInterface {
|
||||
mock := &SamlInterface{}
|
||||
mock.Mock.Test(t)
|
||||
|
||||
t.Cleanup(func() { mock.AssertExpectations(t) })
|
||||
|
||||
return mock
|
||||
}
|
||||
|
||||
Ссылка в новой задаче
Block a user