Merge pull request #1011 from LandonTClipp/LandonTClipp/invalid_variadic

Fix variadic mock generation when `unroll-variadic: false`.

Author: LandonTClipp

.mockery_testify.yml

@@ -36,6 +36,9 @@ packages:
           - structname: MockVariadicWithMultipleReturnsUnrollVariadic
             template-data:
               unroll-variadic: true
+          - structname: MockVariadicWithMultipleReturns
+            template-data:
+              unroll-variadic: false
       RequesterVariadic:
         configs:
           - structname: MockRequesterVariadicOneArgument

internal/fixtures/mocks_testify_test_test.go

@@ -0,0 +1,40 @@
+package test
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/mock"
+)
+
+func TestNoUnrollVariadic(t *testing.T) {
+	m := NewMockVariadicWithMultipleReturns(t)
+	m.EXPECT().Foo(mock.Anything, mock.Anything).RunAndReturn(
+		func(one string, two ...string) (string, error) {
+			var s string = one
+			for _, t := range two {
+				s += t
+			}
+			return s, nil
+		},
+	)
+	ret, err := m.Foo("one", "two", "three")
+	assert.NoError(t, err)
+	assert.Equal(t, "onetwothree", ret)
+}
+
+func TestUnrollVariadic(t *testing.T) {
+	m := NewMockVariadicWithMultipleReturnsUnrollVariadic(t)
+	m.EXPECT().Foo(mock.Anything, mock.Anything, mock.Anything).RunAndReturn(
+		func(one string, two ...string) (string, error) {
+			var s string = one
+			for _, t := range two {
+				s += t
+			}
+			return s, nil
+		},
+	)
+	ret, err := m.Foo("one", "two", "three")
+	assert.NoError(t, err)
+	assert.Equal(t, "onetwothree", ret)
+}

internal/fixtures/variadic_with_multiple_returns_test.go

@@ -125,7 +125,7 @@ func (_mock *{{$mock.StructName}}{{ $mock.TypeInstantiation }}) {{$method.Name}}
 
 		{{- if gt (len $method.Returns) 1 }}
 	if returnFunc, ok := {{ $retArgs }}.Get(0).(func{{ $method.SignatureNoName }}); ok {
-		return returnFunc({{- if (index $mock.TemplateData "unroll-variadic") }}{{ $method.ArgCallList }}{{- else }}{{ $method.ArgCallListNoEllipsis }}{{- end }})
+		return returnFunc({{ $method.ArgCallList }})
 	}
 		{{- end }}