Skip to content

Commit

Permalink
Fix test on go1.18.
Browse files Browse the repository at this point in the history
  • Loading branch information
i-sevostyanov committed Apr 21, 2022
1 parent fe03b57 commit 8bdc90d
Show file tree
Hide file tree
Showing 4 changed files with 58 additions and 31 deletions.
18 changes: 16 additions & 2 deletions mocks/pkg/fixtures/example_project/bar/foo/Client.go

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

29 changes: 0 additions & 29 deletions mocks/pkg/fixtures/example_project/foo/Collision.go

This file was deleted.

41 changes: 41 additions & 0 deletions mocks/pkg/fixtures/example_project/foo/PackageNameSameAsImport.go

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

1 change: 1 addition & 0 deletions pkg/generator_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1805,6 +1805,7 @@ func (s *GeneratorSuite) TestInPackagePackageCollision() {
import barfoo "github.com/vektra/mockery/v2/pkg/fixtures/example_project/bar/foo"
import mock "github.com/stretchr/testify/mock"
import testing "testing"
`
generator := NewGenerator(
Expand Down

0 comments on commit 8bdc90d

Please sign in to comment.