Skip to content

Commit 93f3da0

Browse files
committed
chore: make lint happy
1 parent b3f6fd3 commit 93f3da0

File tree

5 files changed

+9
-9
lines changed

5 files changed

+9
-9
lines changed

.github/workflows/test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,13 @@ jobs:
3434
3535
- name: Test
3636
run: |
37-
go test -coverpkg=./... -coverprofile=coverage.txt -covermode=atomic -timeout=30m -parallel=4 -v ./...
37+
go test -coverpkg=./... -coverprofile=coverage.out -covermode=atomic -timeout=30m -parallel=4 -v ./...
3838
3939
- name: Upload
4040
uses: codecov/codecov-action@v3
4141
with:
4242
token:
43-
files: ./coverage.txt
43+
files: ./coverage.out
4444
name: jzfs
4545
fail_ci_if_error: true
4646
verbose: true

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ jzfs
1717
*.test
1818

1919
# Test coverage file
20-
coverage.txt
20+
coverage.out
21+
2122

2223
# Dependency directories (remove the comment below to include it)
2324
# vendor/

models/models_test.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,11 @@ package models_test
33
import (
44
"context"
55
"fmt"
6-
"github.com/jiaozifs/jiaozifs/models"
6+
77
"testing"
88

9+
"github.com/jiaozifs/jiaozifs/models"
10+
911
embeddedpostgres "github.com/fergusstrange/embedded-postgres"
1012

1113
"github.com/phayes/freeport"

models/user.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ import (
99
"github.com/uptrace/bun"
1010
)
1111

12-
var _user = (*User)(nil)
13-
1412
type User struct {
1513
bun.BaseModel `bun:"table:users,alias:u"`
1614
ID uuid.UUID `bun:"id,pk,type:uuid,default:uuid_generate_v4()"`

models/user_test.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@ import (
2323
"github.com/stretchr/testify/require"
2424

2525
embeddedpostgres "github.com/fergusstrange/embedded-postgres"
26-
27-
_ "github.com/jiaozifs/jiaozifs/models/migrations"
2826
)
2927

3028
var dbTimeCmpOpt = cmp.Comparer(func(x, y time.Time) bool {
@@ -41,7 +39,8 @@ func setup(ctx context.Context, t *testing.T) (*embeddedpostgres.EmbeddedPostgre
4139
db, err := models.SetupDatabase(ctx, fxtest.NewLifecycle(t), &config.DatabaseConfig{Debug: true, Connection: fmt.Sprintf(testConnTmpl, port)})
4240
require.NoError(t, err)
4341

44-
migrations.MigrateDatabase(ctx, db)
42+
err = migrations.MigrateDatabase(ctx, db)
43+
require.NoError(t, err)
4544
return postgres, db
4645
}
4746
func TestNewUserRepo(t *testing.T) {

0 commit comments

Comments
 (0)