Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 32 additions & 0 deletions .mockery_matryer.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
template: matryer
mockname: "Moq{{.InterfaceName}}"
filename: "mocks_matryer_{{.SrcPackageName}}_test.go"
all: true
template-data:
skip-ensure: False
stub-impl: True
with-resets: True
boilerplate-file: "./.boilerplate.txt"
packages:
github.com/vektra/mockery/v3/internal/fixtures:
config:
all: false
include-regex: '.*'
exclude-regex: 'RequesterGenerics'
interfaces:
Requester:
configs:
- mockname: "Moq{{.InterfaceName}}SkipEnsure"
template-data:
skip-ensure: True
- {}
- mockname: StubMatyer{{.InterfaceName}}
template-data:
stub-impl: True
github.com/vektra/mockery/v3/internal/fixtures/empty_return:
interfaces:
EmptyReturn:
configs:
- mockname: StubMatyer{{.InterfaceName}}
template-data:
stub-impl: True
22 changes: 0 additions & 22 deletions .mockery_moq.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .mockery.yml → .mockery_testify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ all: True
dir: "{{.InterfaceDirRelative}}"
mockname: "Mock{{.InterfaceName}}"
pkgname: "{{.SrcPackageName}}"
filename: "mocks_{{.SrcPackageName}}_test.go"
filename: "mocks_testify_{{.SrcPackageName}}_test.go"
template-data:
boilerplate-file: "./.boilerplate.txt"
packages:
Expand Down
10 changes: 5 additions & 5 deletions Taskfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ tasks:
mocks.remove:
desc: remove all mock files
cmds:
- find . -name '*_mock.go' -o -name 'mock_*_test.go' -o -name 'mocks.go' -o -name "mocks_moq.go" -o -name 'mocks_test.go' -o -name 'mocks_*_test.go' | xargs -r rm
- find . -name '*_mock.go' -o -name 'mock_*_test.go' -o -name 'mocks.go' -o -name "mocks_moq.go" -o -name 'mocks_test.go' -o -name 'mocks_*_test.go' -o -name 'mocks_matryer_*.go' | xargs -r rm
- rm -rf mocks/

mocks.generate.custom:
Expand All @@ -32,18 +32,18 @@ tasks:
mocks.generate.mockery:
silent: True
cmds:
- MOCKERY_CONFIG=./.mockery.yml go run .
- MOCKERY_CONFIG=./.mockery_testify.yml go run .

mocks.generate.moq:
mocks.generate.matryer:
silent: True
cmds:
- MOCKERY_CONFIG=./.mockery_moq.yml go run .
- MOCKERY_CONFIG=./.mockery_matryer.yml go run .

mocks.generate:
desc: generate mocks
deps:
- mocks.generate.mockery
- mocks.generate.moq
- mocks.generate.matryer

docker:
desc: build the mockery docker image
Expand Down
1 change: 0 additions & 1 deletion config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -503,7 +503,6 @@ type Config struct {
ReplaceType map[string]map[string]*ReplaceType `koanf:"replace-type" yaml:"replace-type,omitempty"`
Template *string `koanf:"template" yaml:"template,omitempty"`
TemplateData map[string]any `koanf:"template-data" yaml:"template-data,omitempty"`
Version *bool `koanf:"version" yaml:"version,omitempty"`
}

func (c *Config) FilePath() *pathlib.Path {
Expand Down
214 changes: 0 additions & 214 deletions internal/fixtures/buildtag/comment/mocks_comment_test.go

This file was deleted.

Loading