Fixed paths for go:generate to work with -o parameter

gojuno · Jan 2, 2024 · 67ccb42 · 67ccb42
1 parent 983f018
commit 67ccb42
Show file tree

Hide file tree

Showing 15 changed files with 23 additions and 21 deletions.
diff --git a/cmd/minimock/minimock.go b/cmd/minimock/minimock.go
@@ -148,6 +148,8 @@ func processPackage(opts generator.Options, interfaces []types.InterfaceSpecific
 			return errors.Wrapf(err, "failed to generate mock for %s", iface.InterfaceName)
 		}
 
+		opts.HeaderVars["OutputFile"] = filepath.Base(opts.OutputFile)
+
 		opts.Vars["MockName"] = fmt.Sprintf("%sMock", opts.InterfaceName)
 		if mockName != "" {
 			opts.Vars["MockName"] = mockName

diff --git a/template.go b/template.go
@@ -8,7 +8,7 @@ const (
 		// Code generated by http://github.com/gojuno/minimock ({{$.Options.HeaderVars.Version}}). DO NOT EDIT.
 
 		{{if $.Options.HeaderVars.GenerateInstruction}}
-		//go:generate minimock -i {{$.SourcePackage.PkgPath}}.{{$.Options.InterfaceName}} -o {{$.Options.OutputFile}} -n {{(title (index $.Vars "MockName"))}}
+		//go:generate minimock -i {{$.SourcePackage.PkgPath}}.{{$.Options.InterfaceName}} -o {{$.Options.HeaderVars.OutputFile}} -n {{(title (index $.Vars "MockName"))}}
 		{{end}}
 
 		import (

diff --git a/tests/context_accepter_mock.go b/tests/context_accepter_mock.go
diff --git a/tests/formatter_mock.go b/tests/formatter_mock.go
diff --git a/tests/formatter_with_custom_name_mock.go b/tests/formatter_with_custom_name_mock.go
diff --git a/tests/generic_complex_union.go b/tests/generic_complex_union.go
diff --git a/tests/generic_in.go b/tests/generic_in.go
diff --git a/tests/generic_inline_union.go b/tests/generic_inline_union.go
diff --git a/tests/generic_inline_with_many_options.go b/tests/generic_inline_with_many_options.go
diff --git a/tests/generic_inout.go b/tests/generic_inout.go
diff --git a/tests/generic_multiple_args_with_different_types.go b/tests/generic_multiple_args_with_different_types.go
diff --git a/tests/generic_out.go b/tests/generic_out.go
diff --git a/tests/generic_simple_union.go b/tests/generic_simple_union.go
diff --git a/tests/generic_specific.go b/tests/generic_specific.go
diff --git a/tests/tester_mock_test.go b/tests/tester_mock_test.go