Skip to content

Commit e735cb3

Browse files
committed
feat: simplify mock handling
mockgen generated mocks are now expected to be: * in the same directory as the _test.go files * suffixed _mock_test.go, so they are handled correctly by the go tooling (ignored during build, coverage calculation etc.) * in the same package as the _test.go files Example: mockgen -source=foo.go -package=foo_test -destination=foo_mock_test.go -write_generate_directive
1 parent 12ad9cb commit e735cb3

File tree

3 files changed

+2
-6
lines changed

3 files changed

+2
-6
lines changed

.github/workflows/coverage.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,7 @@ jobs:
1616
go-version: stable
1717
- name: Calculate coverage
1818
run: |
19-
go test -v -covermode=atomic -coverprofile=cover.out.raw -coverpkg=./... ./...
20-
# remove generated code from coverage calculation
21-
grep -Ev 'internal/mock|_enumer.go' cover.out.raw > cover.out
19+
go test -v -covermode=atomic -coverprofile=cover.out -coverpkg=./... ./...
2220
- name: Generage coverage badge
2321
uses: vladopajic/go-test-coverage@c7fe52e0f48e0fbed8c1812824c5346218443c70 # v2.10.2
2422
with:

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
/dist
22
/cover.out
3-
/cover.out.raw
43
/sbom.spdx.json

Makefile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,5 @@ fuzz: mod-tidy generate
2727

2828
.PHONY: cover
2929
cover: mod-tidy generate
30-
go test -v -covermode=atomic -coverprofile=cover.out.raw -coverpkg=./... ./...
31-
grep -Ev 'internal/mock|_enumer.go' cover.out.raw > cover.out
30+
go test -v -covermode=atomic -coverprofile=cover.out -coverpkg=./... ./...
3231
go tool cover -html=cover.out

0 commit comments

Comments
 (0)