add tests

.mockery.yaml

@@ -5,6 +5,7 @@ mockname: "{{.InterfaceName}}"
 filename: "{{.MockName}}.go"
 outpkg: mocks
 tags: "custom2"
+issue-845-fix: True
 packages:
   github.com/vektra/mockery/v2/pkg/fixtures/buildtag/comment:
     config:
@@ -78,3 +79,18 @@ packages:
       outpkg: "{{.PackageName}}_test"
       filename: "{{.InterfaceNameSnake}}_mock_test.go"
       keeptree: True    
+  github.com/vektra/mockery/v2/pkg/fixtures/issue845:
+    config:
+      all: True
+      dir: "{{.InterfaceDir}}"
+      mockname: "{{.InterfaceName}}"
+      outpkg: "{{.PackageName}}_test"
+      filename: "mock_{{.MockName}}_test.go"
+      inpackage: True
+    interfaces:
+      Interface:
+        configs:
+          - issue-845-fix: False
+            mockname: WithoutFix
+          - issue-845-fix: True
+            mockname: WithFix

pkg/fixtures/issue845/interface.go

@@ -0,0 +1,5 @@
+package issue845
+
+type Interface interface {
+	Foo() string
+}

pkg/fixtures/issue845/interface_test.go

@@ -0,0 +1,32 @@
+package issue845
+
+import (
+	"strings"
+	"testing"
+
+	"github.com/chigopher/pathlib"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+func TestFix(t *testing.T) {
+	for _, tt := range []struct {
+		filepath        string
+		expectedPackage string
+	}{
+		{
+			filepath:        "./mock_WithFix_test.go",
+			expectedPackage: "package issue845_test",
+		},
+		{
+			filepath:        "./mock_WithoutFix_test.go",
+			expectedPackage: "package issue845",
+		},
+	} {
+		path := pathlib.NewPath(tt.filepath)
+		bytes, err := path.ReadFile()
+		require.NoError(t, err)
+		fileString := string(bytes)
+		assert.True(t, strings.Contains(fileString, tt.expectedPackage))
+	}
+}

pkg/generator.go

@@ -59,7 +59,7 @@ type GeneratorConfig struct {
 	KeepTree             bool
 	Note                 string
 	MockBuildTags        string
-	PackageName          string
+	Outpkg               string
 	PackageNamePrefix    string
 	StructName           string
 	UnrollVariadic       bool
@@ -85,12 +85,14 @@ type Generator struct {
 
 // NewGenerator builds a Generator.
 func NewGenerator(ctx context.Context, c GeneratorConfig, iface *Interface, pkg string) *Generator {
-	if pkg == "" {
+	if c.Issue845Fix {
+		pkg = c.Outpkg
+	} else if pkg == "" {
 		pkg = DetermineOutputPackageName(
 			iface.FileName,
 			iface.Pkg.Name(),
 			c.PackageNamePrefix,
-			c.PackageName,
+			c.Outpkg,
 			c.KeepTree,
 			c.InPackage,
 		)
@@ -428,7 +430,7 @@ func (g *Generator) GeneratePrologue(ctx context.Context, pkg string) {
 				"url": logging.DocsURL("/deprecations/#issue-845-fix"),
 			},
 		)
-		if !g.config.Issue845Fix && g.config.InPackage {
+		if g.config.InPackage {
 			g.printf("package %s\n\n", g.iface.Pkg.Name())
 		} else {
 			g.printf("package %v\n\n", pkg)

pkg/outputter.go

@@ -332,10 +332,11 @@ func (m *Outputter) Generate(ctx context.Context, iface *Interface) error {
 			DisableVersionString: interfaceConfig.DisableVersionString,
 			Exported:             interfaceConfig.Exported,
 			InPackage:            interfaceConfig.InPackage,
+			Issue845Fix:          interfaceConfig.Issue845Fix,
 			KeepTree:             interfaceConfig.KeepTree,
 			Note:                 interfaceConfig.Note,
 			MockBuildTags:        interfaceConfig.MockBuildTags,
-			PackageName:          interfaceConfig.Outpkg,
+			Outpkg:               interfaceConfig.Outpkg,
 			PackageNamePrefix:    interfaceConfig.Packageprefix,
 			StructName:           interfaceConfig.MockName,
 			UnrollVariadic:       interfaceConfig.UnrollVariadic,

pkg/walker.go

@@ -183,7 +183,7 @@ func (v *GeneratorVisitor) VisitWalk(ctx context.Context, iface *Interface) erro
 		KeepTree:             v.config.KeepTree,
 		Note:                 v.config.Note,
 		MockBuildTags:        v.config.MockBuildTags,
-		PackageName:          v.config.PackageName,
+		Outpkg:               v.config.PackageName,
 		PackageNamePrefix:    v.config.PackageNamePrefix,
 		StructName:           v.config.StructName,
 		UnrollVariadic:       v.config.UnrollVariadic,