diff --git a/pkg/template/mockery.templ b/pkg/template/mockery.templ index 9ebebbbb5..d83d6adc4 100644 --- a/pkg/template/mockery.templ +++ b/pkg/template/mockery.templ @@ -50,14 +50,20 @@ func (_mock *{{$mock.MockName}}{{ $mock | TypeInstantiation }}) {{$method.Name}} ($method.IsVariadic) (not (index $mock.TemplateData "unroll-variadic")) }} + + {{- if ne (len $method.Returns) 0}} var tmpRet mock.Arguments + {{- $calledString = "tmpRet" }} + {{- else }} + {{- $calledString = "" }} + {{- end }} + {{- $lastParam := index $method.Params (len $method.Params | Add -1 )}} if len({{ $lastParam.Var.Name }}) > 0 { - tmpRet = _mock.Called({{- if (index $mock.TemplateData "unroll-variadic") }}{{ $method.ArgCallList }}{{- else }}{{ $method.ArgCallListNoEllipsis }}{{- end }}) + {{- if ne (len $method.Returns) 0}}tmpRet = {{ end }}_mock.Called({{- if (index $mock.TemplateData "unroll-variadic") }}{{ $method.ArgCallList }}{{- else }}{{ $method.ArgCallListNoEllipsis }}{{- end }}) } else { - tmpRet = _mock.Called({{- if (index $mock.TemplateData "unroll-variadic") }}{{ $method.ArgCallListSlice 0 (len $method.Params | Add -1 )}}{{- else }}{{ $method.ArgCallListSliceNoEllipsis 0 (len $method.Params | Add -1 )}}{{- end }}) + {{- if ne (len $method.Returns) 0}}tmpRet = {{ end }}_mock.Called({{- if (index $mock.TemplateData "unroll-variadic") }}{{ $method.ArgCallListSlice 0 (len $method.Params | Add -1 )}}{{- else }}{{ $method.ArgCallListSliceNoEllipsis 0 (len $method.Params | Add -1 )}}{{- end }}) } - {{- $calledString = "tmpRet" }} {{- else }} {{- $calledString = printf "_mock.Called(%s)" $method.ArgCallList }} {{- end }}