From 6e28e919ceaf65573e36c790e9c8b29bd6195a14 Mon Sep 17 00:00:00 2001 From: Skyenought Date: Tue, 29 Aug 2023 19:56:52 +0800 Subject: [PATCH] test --- .github/workflows/govulncheck.yml | 22 +++++++++++----------- .github/workflows/test-fiberi18n.yml | 2 +- fiberi18n/i18n.go | 15 ++++++++------- fiberi18n/i18n_test.go | 3 +-- 4 files changed, 21 insertions(+), 21 deletions(-) diff --git a/.github/workflows/govulncheck.yml b/.github/workflows/govulncheck.yml index 12b35941..8be13103 100644 --- a/.github/workflows/govulncheck.yml +++ b/.github/workflows/govulncheck.yml @@ -37,44 +37,44 @@ jobs: run: go install golang.org/x/vuln/cmd/govulncheck@latest - name: Run govulncheck (paseto) working-directory: ./paseto - run: govulncheck ./... + run: go mod tidy && govulncheck ./... # ----- - name: Run govulncheck (fiberzap) working-directory: ./fiberzap - run: govulncheck ./... + run: go mod tidy && govulncheck ./... # ----- - name: Run govulncheck (otelfiber) working-directory: ./otelfiber - run: govulncheck ./... + run: go mod tidy && govulncheck ./... - name: Run govulncheck (swagger) working-directory: ./swagger - run: govulncheck ./... + run: go mod tidy && govulncheck ./... # ----- - name: Run govulncheck (casbin) working-directory: ./casbin - run: govulncheck ./... + run: go mod tidy && govulncheck ./... # ----- - name: Run govulncheck (fibernewrelic) working-directory: ./fibernewrelic - run: govulncheck ./... + run: go mod tidy && govulncheck ./... # ----- - name: Run govulncheck (opafiber) working-directory: ./opafiber - run: govulncheck ./... + run: go mod tidy && govulncheck ./... # ----- - name: Run govulncheck (fiberi18n) working-directory: ./fiberi18n - run: govulncheck ./... + run: go mod tidy && govulncheck ./... # ----- - name: Run govulncheck (fiberzerolog) working-directory: ./fiberzerolog - run: govulncheck ./... + run: go mod tidy && govulncheck ./... # ----- - name: Run govulncheck (jwt) working-directory: ./jwt - run: govulncheck ./... + run: go mod tidy && govulncheck ./... # ----- - name: Run govulncheck (websocket) working-directory: ./websocket - run: govulncheck ./... + run: go mod tidy && govulncheck ./... # ----- diff --git a/.github/workflows/test-fiberi18n.yml b/.github/workflows/test-fiberi18n.yml index 3d4a77cb..9a513f94 100644 --- a/.github/workflows/test-fiberi18n.yml +++ b/.github/workflows/test-fiberi18n.yml @@ -29,4 +29,4 @@ jobs: go-version: '${{ matrix.go-version }}' - name: Run Test working-directory: ./fiberi18n - run: go test -v -race ./... + run: go mod tidy && go test -v -race ./... diff --git a/fiberi18n/i18n.go b/fiberi18n/i18n.go index a88e0572..1898e73d 100644 --- a/fiberi18n/i18n.go +++ b/fiberi18n/i18n.go @@ -12,19 +12,20 @@ import ( // New creates a new middleware handler func New(config ...*Config) fiber.Handler { - appCfg := configDefault(config...) + cfg := configDefault(config...) // init bundle - bundle := i18n.NewBundle(appCfg.DefaultLanguage) - bundle.RegisterUnmarshalFunc(appCfg.FormatBundleFile, appCfg.UnmarshalFunc) - appCfg.bundle = bundle + bundle := i18n.NewBundle(cfg.DefaultLanguage) + bundle.RegisterUnmarshalFunc(cfg.FormatBundleFile, cfg.UnmarshalFunc) + cfg.bundle = bundle - appCfg.loadMessages().initLocalizerMap() + cfg.loadMessages() + cfg.initLocalizerMap() return func(c *fiber.Ctx) error { - if appCfg.Next != nil && appCfg.Next(c) { + if cfg.Next != nil && cfg.Next(c) { return c.Next() } - c.Locals("fiberi18n", appCfg) + c.Locals("fiberi18n", cfg) return c.Next() } } diff --git a/fiberi18n/i18n_test.go b/fiberi18n/i18n_test.go index 098297ac..de79098f 100644 --- a/fiberi18n/i18n_test.go +++ b/fiberi18n/i18n_test.go @@ -206,7 +206,6 @@ func TestLocalize(t *testing.T) { } func Test_defaultLangHandler(t *testing.T) { - t.Parallel() app := fiber.New() app.Use(New()) app.Get("/", func(c *fiber.Ctx) error { @@ -215,7 +214,7 @@ func Test_defaultLangHandler(t *testing.T) { app.Get("/test", func(c *fiber.Ctx) error { return c.SendString(defaultLangHandler(c, language.English.String())) }) - + t.Parallel() t.Run("test nil ctx", func(t *testing.T) { var wg sync.WaitGroup want := 100