From 8954cffb7adf9cd83418be00e771423002d75d52 Mon Sep 17 00:00:00 2001 From: Jan Bader Date: Tue, 5 Apr 2022 20:00:25 +0000 Subject: [PATCH] Move config to global variable --- server/account_test.go | 9 ++------- server/main_test.go | 16 ++++++++++++---- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/server/account_test.go b/server/account_test.go index 591dc46..a5580f0 100644 --- a/server/account_test.go +++ b/server/account_test.go @@ -11,24 +11,19 @@ import ( "git.javil.eu/jacob1123/budgeteer/bcrypt" "git.javil.eu/jacob1123/budgeteer/jwt" "git.javil.eu/jacob1123/budgeteer/postgres" - txdb "github.com/DATA-DOG/go-txdb" "github.com/gin-gonic/gin" ) -func init() { //nolint:gochecknoinits - txdb.Register("pgtx", "pgx", "postgres://budgeteer:budgeteer@db:5432/budgeteer_test") -} - func TestRegisterUser(t *testing.T) { t.Parallel() - database, err := postgres.Connect("pgtx", "example") + database, err := postgres.Connect("pgtx", cfg.DatabaseConnection) if err != nil { fmt.Printf("could not connect to db: %s\n", err) t.Skip() return } - tokenVerifier, _ := jwt.NewTokenVerifier("this_is_my_demo_secret_for_unit_tests") + tokenVerifier, _ := jwt.NewTokenVerifier(cfg.SessionSecret) h := Handler{ Service: database, TokenVerifier: tokenVerifier, diff --git a/server/main_test.go b/server/main_test.go index de190b7..9311c7a 100644 --- a/server/main_test.go +++ b/server/main_test.go @@ -16,19 +16,27 @@ import ( "git.javil.eu/jacob1123/budgeteer/jwt" "git.javil.eu/jacob1123/budgeteer/postgres" "git.javil.eu/jacob1123/budgeteer/web" + + txdb "github.com/DATA-DOG/go-txdb" ) +var cfg = config.Config{ //nolint:gochecknoglobals + DatabaseConnection: "postgres://budgeteer:budgeteer@db:5432/budgeteer_test", + SessionSecret: "this_is_my_demo_secret_for_unit_tests", +} + +func init() { //nolint:gochecknoinits + txdb.Register("pgtx", "pgx", cfg.DatabaseConnection) +} + func TestMain(t *testing.T) { t.Parallel() - cfg := config.Config{ - DatabaseConnection: "postgres://budgeteer:budgeteer@db:5432/budgeteer_test", - SessionSecret: "random string for JWT authorization", - } _, err := postgres.Connect("pgx", cfg.DatabaseConnection) if err != nil { log.Fatalf("Failed connecting to DB: %v", err) } + queries, err := postgres.Connect("pgtx", cfg.DatabaseConnection) if err != nil { log.Fatalf("Failed connecting to DB: %v", err)