Skip to content
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
4 changes: 2 additions & 2 deletions foo_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ import (

func TestFoo(t *testing.T) {
m := newMockfoo(t)
m.EXPECT().Bar().Return(baz("foo"))
assert.Equal(t, "foo", m.Bar())
m.EXPECT().Bar().Return("foo")
assert.Equal(t, baz("foo"), m.Bar())
}
21 changes: 14 additions & 7 deletions internal/cmd/mockery.go
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,18 @@ func (i *InterfaceCollection) Append(ctx context.Context, iface *internal.Interf
return nil
}

func writeFile(path string, data []byte) error {
f, err := os.Create(path)
if err != nil {
return stackerr.NewStackErr(err)
}
defer f.Close()
if _, err = f.Write(data); err != nil {
return stackerr.NewStackErr(err)
}
return nil
}

func (r *RootApp) Run() error {
remoteTemplateCache := make(map[string]*internal.RemoteTemplate)

Expand Down Expand Up @@ -374,13 +386,8 @@ func (r *RootApp) Run() error {
return fmt.Errorf("outfile exists")
}

file, err := os.Create(outFilePath)
if err != nil {
return stackerr.NewStackErr(err)
}
defer file.Close()
if _, err = file.Write(templateBytes); err != nil {
return stackerr.NewStackErr(err)
if err := writeFile(outFilePath, templateBytes); err != nil {
return err
}
}

Expand Down
Loading