Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Skip RunAndReturn() on functions with no returns #782

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
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
Skip RunAndReturn() on functions with no returns
On functions that don't return anything, RunAndReturn() doesn't call
the function given. To avoid misleading users, this changes mockery to
not generate RunAndReturn() on such functions; it doesn't seem
particularly useful anyway because there's no return value to specify.

Return() is preserved even though it isn't needed either, to avoid
confusion with mock.Call.

Signed-off-by: Stephen Kitt <skitt@redhat.com>
  • Loading branch information
skitt committed Jun 5, 2024
commit fe81d9a78e93dc533d2850a1fd0350731e4dc94c
5 changes: 0 additions & 5 deletions mocks/github.com/vektra/mockery/v2/pkg/fixtures/Expecter.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 0 additions & 5 deletions mocks/github.com/vektra/mockery/v2/pkg/fixtures/Fooer.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 0 additions & 5 deletions mocks/github.com/vektra/mockery/v2/pkg/fixtures/Requester4.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 0 additions & 5 deletions mocks/github.com/vektra/mockery/v2/pkg/fixtures/Sibling.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions pkg/generator.go
Original file line number Diff line number Diff line change
Expand Up @@ -964,11 +964,13 @@ func (_c *{{.CallStruct}}{{ .InstantiatedTypeString }}) Return({{range .Returns.
_c.Call.Return({{range .Returns.Names}}{{.}},{{end}})
return _c
}
{{- if (gt (len .Returns.Params) 0)}}

func (_c *{{.CallStruct}}{{ .InstantiatedTypeString }}) RunAndReturn(run func({{range .Params.Types}}{{.}},{{end}})({{range .Returns.Types}}{{.}},{{end}})) *{{.CallStruct}}{{ .InstantiatedTypeString }} {
_c.Call.Return(run)
return _c
}
{{- end}}
`)
}

Expand Down
Loading