From 8f516e74e927f659fd857d2abe133b0add1c9af5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wysoki=C5=84ski?= Date: Sat, 15 Jul 2023 06:47:51 +0200 Subject: [PATCH] fix: tests --- internal/adapter/adapter_test.go | 11 +++++++++-- internal/adapter/bun_test.go | 2 +- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/internal/adapter/adapter_test.go b/internal/adapter/adapter_test.go index af85904..e1d6139 100644 --- a/internal/adapter/adapter_test.go +++ b/internal/adapter/adapter_test.go @@ -20,8 +20,7 @@ const ( ) func TestMain(m *testing.M) { - goose.SetBaseFS(os.DirFS("../../migrations")) - goose.SetLogger(goose.NopLogger()) + setUpGoose() _, isDBDSNPresent := os.LookupEnv(envDBDSN) _, isRedisConnectionStringPresent := os.LookupEnv(envRedisConnectionString) @@ -64,6 +63,14 @@ func TestMain(m *testing.M) { os.Exit(code) } +func setUpGoose() { + goose.SetBaseFS(os.DirFS("../../migrations")) + goose.SetLogger(goose.NopLogger()) + if err := goose.SetDialect("postgres"); err != nil { + log.Fatalf("goose - couldn't set dialect: %s", err) + } +} + func newPostgres(pool *dockertest.Pool) (*dockertest.Resource, *url.URL) { q := url.Values{} q.Add("sslmode", "disable") diff --git a/internal/adapter/bun_test.go b/internal/adapter/bun_test.go index 9322c3d..307130b 100644 --- a/internal/adapter/bun_test.go +++ b/internal/adapter/bun_test.go @@ -52,7 +52,7 @@ func newBunDB(tb testing.TB) *bun.DB { func runMigrations(tb testing.TB, db *sql.DB) { tb.Helper() - require.NoError(tb, goose.Up(db, "")) + require.NoError(tb, goose.Up(db, ".")) } type bunfixture struct {