Skip to content

Commit 7714096

Browse files
committed
v3: Fix constructor name not respecting exported-ness
Fixes #993
1 parent d83e069 commit 7714096

16 files changed

+302
-147
lines changed

.mockery_testify.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,14 @@ force-file-write: true
33
formatter: "goimports"
44
all: True
55
dir: "{{.InterfaceDirRelative}}"
6-
structname: "Mock{{.InterfaceName}}"
6+
structname: "{{.Mock}}{{.InterfaceName}}"
77
pkgname: "{{.SrcPackageName}}"
88
filename: "mocks_testify_{{.SrcPackageName}}_test.go"
99
template-data:
1010
boilerplate-file: "./.boilerplate.txt"
1111
packages:
1212
github.com/vektra/mockery/v3/internal/cmd:
13+
github.com/vektra/mockery/v3/internal/fixtures/unexported:
1314
github.com/vektra/mockery/v3/internal/fixtures/buildtag/comment:
1415
github.com/vektra/mockery/v3/internal/fixtures/example_project/replace_type:
1516
config:

config/config.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ func NewDefaultKoanf(ctx context.Context) (*koanf.Koanf, error) {
9292
ForceFileWrite: addr(false),
9393
Formatter: addr("goimports"),
9494
LogLevel: addr("info"),
95-
StructName: addr("Mock{{.InterfaceName}}"),
95+
StructName: addr("{{.Mock}}{{.InterfaceName}}"),
9696
PkgName: addr("{{.SrcPackageName}}"),
9797
Recursive: addr(false),
9898
RequireTemplateSchemaExists: addr(true),

docs/configuration.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ filename: mocks_test.go
1919
force-file-write: false
2020
formatter: goimports
2121
log-level: info
22-
structname: Mock{{.InterfaceName}}
22+
structname: {{.Mock}}{{.InterfaceName}}
2323
pkgname: '{{.SrcPackageName}}'
2424
recursive: false
2525
template: testify
@@ -83,7 +83,7 @@ import (
8383
dir: "{{.InterfaceDir}}"
8484
filename: "mocks_test.go"
8585
outpkg: "{{.PackageName}}_test"
86-
structname: "Mock{{.InterfaceName}}"
86+
structname: "{{.Mock}}{{.InterfaceName}}"
8787
interfaces:
8888
Foo:
8989
Bar:
@@ -127,7 +127,7 @@ Parameter Descriptions
127127
| `formatter` | :fontawesome-solid-x: | `#!yaml "goimports"` | The formatter to use on the rendered template. Choices are: `gofmt`, `goimports`, `noop`. |
128128
| `include-interface-regex` | :fontawesome-solid-x: | `#!yaml ""` | When set, only interface names that match the expression will be generated. This setting is ignored if `all: True` is specified in the configuration. To further refine the interfaces generated, use `exclude-interface-regex`. |
129129
| `log-level` | :fontawesome-solid-x: | `#!yaml "info"` | Set the level of the logger |
130-
| `structname` | :fontawesome-solid-check: | `#!yaml "Mock{{.InterfaceName}}"` | The name of the generated interface implementation. |
130+
| `structname` | :fontawesome-solid-check: | `#!yaml "{{.Mock}}{{.InterfaceName}}"` | The name of the generated interface implementation. |
131131
| `packages` | :fontawesome-solid-x: | `#!yaml null` | A dictionary containing configuration describing the packages and interfaces to generate mocks for. |
132132
| `pkgname` | :fontawesome-solid-check: | `#!yaml "{{.SrcPackageName}}"` | The `#!go package name` given to the generated mock files. |
133133
| `recursive` | :fontawesome-solid-x: | `#!yaml false` | When set to `true` on a particular package, mockery will recursively search for all sub-packages and inject those packages into the config map. |

internal/cmd/init_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ func Test_initRun(t *testing.T) {
4242
args: args{
4343
args: []string{"github.com/org/repo"},
4444
params: func(t *testing.T, configPath string) argGetter {
45-
m := NewMockargGetter(t)
45+
m := newmockargGetter(t)
4646
m.EXPECT().GetString("config").Return(configPath, nil)
4747
return m
4848
},

internal/cmd/mocks_testify_cmd_test.go

+18-18
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/fixtures/method_args/same_name_arg_and_type/entity_test.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ func (s *testStruct) ExecDoB0v2() interfaceB0 {
2828

2929
func Test(t *testing.T) {
3030
t.Run("ExecDoB", func(t *testing.T) {
31-
mockInterfaceB := NewMockinterfaceB(t)
32-
mockInterfaceA := NewMockinterfaceA(t)
31+
mockInterfaceB := newmockinterfaceB(t)
32+
mockInterfaceA := newmockinterfaceA(t)
3333
mockInterfaceA.On("DoB", mock.Anything).Return(mockInterfaceB)
3434

3535
s := testStruct{
@@ -39,8 +39,8 @@ func Test(t *testing.T) {
3939
assert.Equal(t, mockInterfaceB, res)
4040
})
4141
t.Run("ExecDoB0", func(t *testing.T) {
42-
mockInterfaceB0 := NewMockinterfaceB0(t)
43-
mockInterfaceA := NewMockinterfaceA(t)
42+
mockInterfaceB0 := newmockinterfaceB0(t)
43+
mockInterfaceA := newmockinterfaceA(t)
4444
mockInterfaceA.On("DoB0", mock.Anything).Return(mockInterfaceB0)
4545

4646
s := testStruct{
@@ -50,8 +50,8 @@ func Test(t *testing.T) {
5050
assert.Equal(t, mockInterfaceB0, res)
5151
})
5252
t.Run("ExecDoB0v2", func(t *testing.T) {
53-
mockInterfaceB0 := NewMockinterfaceB0(t)
54-
mockInterfaceA := NewMockinterfaceA(t)
53+
mockInterfaceB0 := newmockinterfaceB0(t)
54+
mockInterfaceA := newmockinterfaceA(t)
5555
mockInterfaceA.On("DoB0v2", mock.Anything).Return(mockInterfaceB0)
5656

5757
s := testStruct{

0 commit comments

Comments
 (0)