Merge pull request #1135 from LandonTClipp/fix_interface_dir_relative

Fix breaking change with InterfaceDirRelative

Author: LandonTClipp

.mockery_testify.yml

@@ -142,5 +142,13 @@ packages:
   github.com/vektra/mockery/v3/internal/fixtures/constraint_ifaces:
   github.com/vektra/mockery/v3/internal/fixtures/interface_dir_relative:
     config:
-      dir: '{{.InterfaceDir}}/{{  replaceAll "internal/" "" (index (splitAfterN "/" 2 .InterfaceDirRelative) 0) }}/mocks/{{index (splitAfterN "/" 2 .InterfaceDirRelative) 1}}'
-      filename: "mocks_{{.InterfaceName}}.go"
+      filename: mocks.go
+    interfaces:
+      Foo:
+        configs:
+          # This first option simply asserts that InterfaceDirRelative is an actual path. https://github.com/vektra/mockery/issues/1133
+          - dir: '{{.InterfaceDir}}/{{  replaceAll "internal/" "" (index (splitAfterN "/" 2 .InterfaceDirRelative) 0) }}/mocks/{{index (splitAfterN "/" 2 .InterfaceDirRelative) 1}}'
+          # The second option asserts that the value itself is sane. https://github.com/vektra/mockery/issues/1133#issuecomment-3758283921
+          # This mock will be explicitly tested against so that we can assert in tests that the value
+          # does not encounter breaking changes.
+          - dir: '{{.InterfaceDir}}/{{.InterfaceDirRelative}}'

config/config.go

@@ -653,13 +653,7 @@ func (c *Config) ParseTemplates(
 	workingDir = filepath.ToSlash(workingDir)
 	ifaceFilePath = filepath.ToSlash(filepath.Clean(ifaceFilePath))
 	interfaceDirPath := filepath.ToSlash(filepath.Dir(ifaceFilePath))
-	configPathAbs, err := filepath.Abs(*c.ConfigFile)
-	if err != nil {
-		return fmt.Errorf("getting absolute path of config file: %w", err)
-	}
-	configPathDir := filepath.ToSlash(filepath.Dir(configPathAbs))
-
-	interfaceDirRelativePath, err := filepath.Rel(filepath.FromSlash(configPathDir), filepath.FromSlash(interfaceDirPath))
+	interfaceDirRelativePath, err := filepath.Rel(filepath.FromSlash(workingDir), filepath.FromSlash(interfaceDirPath))
 
 	var interfaceDirRelative string
 

internal/fixtures/interface_dir_relative/interface_test.go

@@ -3,7 +3,7 @@ package interfacedirrelative
 import (
 	"testing"
 
-	mocks "github.com/vektra/mockery/v3/internal/fixtures/interface_dir_relative/mocks/fixtures/interface_dir_relative"
+	mocks "github.com/vektra/mockery/v3/internal/fixtures/interface_dir_relative/internal/fixtures/interface_dir_relative"
 )
 
 func TestFoo(t *testing.T) {

…ures/interface_dir_relative/mocks_Foo.go …fixtures/interface_dir_relative/mocks.gointernal/fixtures/interface_dir_relative/mocks/fixtures/interface_dir_relative/mocks_Foo.go renamed to internal/fixtures/interface_dir_relative/internal/fixtures/interface_dir_relative/mocks.go internal/fixtures/interface_dir_relative/mocks/fixtures/interface_dir_relative/mocks_Foo.go renamed to internal/fixtures/interface_dir_relative/internal/fixtures/interface_dir_relative/mocks.go

@@ -1 +1 @@
-VERSION=v3.6.2
+VERSION=v3.6.3