Add InterfaceDir template variable

This fixes #574
vektra · Mar 9, 2023 · 61d7db1 · 61d7db1
1 parent e478c25
commit 61d7db1
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 2 deletions.
diff --git a/pkg/outputter.go b/pkg/outputter.go
@@ -147,11 +147,13 @@ func outputFilePath(
 
 	// The fields available to the template strings
 	data := struct {
+		InterfaceDir  string
 		InterfaceName string
 		PackageName   string
 		PackagePath   string
 		MockName      string
 	}{
+		InterfaceDir:  filepath.Dir(iface.FileName),
 		InterfaceName: iface.Name,
 		PackageName:   iface.Pkg.Name(),
 		PackagePath:   iface.Pkg.Path(),

diff --git a/pkg/outputter_test.go b/pkg/outputter_test.go
@@ -95,6 +95,7 @@ func Test_outputFilePath(t *testing.T) {
 		packageName      string
 		packagePath      string
 		interfaceName    string
+		fileName         string
 		fileNameTemplate string
 		dirTemplate      string
 		mockName         string
@@ -128,6 +129,19 @@ func Test_outputFilePath(t *testing.T) {
 			},
 			want: pathlib.NewPath("github.com/vektra/mockery/MockFoo_pkg_Foo.go"),
 		},
+		{
+			name: "mock next to original interface",
+			params: parameters{
+				packageName:      "pkg",
+				packagePath:      "github.com/vektra/mockery/pkg/internal",
+				interfaceName:    "Foo",
+				fileName:         "pkg/internal/foo.go",
+				dirTemplate:      "{{.InterfaceDir}}",
+				fileNameTemplate: "mock_{{.InterfaceName}}.go",
+				mockName:         "MockFoo",
+			},
+			want: pathlib.NewPath("pkg/internal/mock_Foo.go"),
+		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
@@ -136,8 +150,9 @@ func Test_outputFilePath(t *testing.T) {
 			mockPackage.EXPECT().Path().Return(tt.params.packagePath)
 
 			iface := &Interface{
-				Name: tt.params.interfaceName,
-				Pkg:  mockPackage,
+				Name:     tt.params.interfaceName,
+				Pkg:      mockPackage,
+				FileName: tt.params.fileName,
 			}
 
 			got, err := outputFilePath(