fixed tests

This commit is contained in:
Jakub Kropáček 2024-11-24 11:29:35 +01:00
parent 8c0d983297
commit 384fd86f66
6 changed files with 35 additions and 6 deletions

View file

@ -8,6 +8,9 @@
pkgs = nixpkgs.legacyPackages.x86_64-linux; pkgs = nixpkgs.legacyPackages.x86_64-linux;
in in
{ {
packages.x86_64-linux = {
default = pkgs.callPackage ./nix/secret-santa.nix { };
};
/* /*
packages.x86_64-linux.default = pkgs.dockerTools.buildLayeredImage { packages.x86_64-linux.default = pkgs.dockerTools.buildLayeredImage {
name = "secret-santa"; name = "secret-santa";

View file

@ -85,7 +85,6 @@ func (c *DatabaseConfig) GetDriver() string {
default: default:
return "" return ""
} }
return string(c.Driver)
} }
func (c *DatabaseConfig) generateSQLiteDSN() string { func (c *DatabaseConfig) generateSQLiteDSN() string {

View file

@ -3,6 +3,7 @@ package handlers_test
import ( import (
"context" "context"
"git.katuwoss.dev/JustScreaMy/secret-santa/internal/testhelpers" "git.katuwoss.dev/JustScreaMy/secret-santa/internal/testhelpers"
_ "github.com/jackc/pgx/v5/stdlib"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"testing" "testing"
) )
@ -11,7 +12,9 @@ import (
func TestHandleGetUsers(t *testing.T) { func TestHandleGetUsers(t *testing.T) {
ctx := context.Background() ctx := context.Background()
database, err := testhelpers.CreatePostgresContainer(ctx) database, err := testhelpers.CreatePostgresContainer(ctx)
t.Log(database.ConnectionString)
assert.NoError(t, err) assert.NoError(t, err)
err = testhelpers.MigrateDatabase("postgres", database.ConnectionString) err = testhelpers.MigrateDatabase("pgx", "postgres", database.ConnectionString)
assert.NoError(t, err) assert.NoError(t, err)
} }

View file

@ -13,7 +13,7 @@ type PostgresContainer struct {
} }
func CreatePostgresContainer(ctx context.Context) (*PostgresContainer, error) { func CreatePostgresContainer(ctx context.Context) (*PostgresContainer, error) {
container, err := postgres.Run(ctx, "16", container, err := postgres.Run(ctx, "docker.io/postgres:16-alpine",
postgres.WithUsername("test-user"), postgres.WithUsername("test-user"),
postgres.WithPassword("test-password"), postgres.WithPassword("test-password"),
postgres.WithDatabase("test-db"), postgres.WithDatabase("test-db"),

View file

@ -5,15 +5,15 @@ import (
"github.com/rubenv/sql-migrate" "github.com/rubenv/sql-migrate"
) )
func MigrateDatabase(databaseDriver string, connectionString string) error { func MigrateDatabase(databaseDriver, databaseDialect, connectionString string) error {
db, err := sql.Open(databaseDriver, connectionString) db, err := sql.Open(databaseDriver, connectionString)
if err != nil { if err != nil {
return err return err
} }
migrations := &migrate.FileMigrationSource{ migrations := &migrate.FileMigrationSource{
Dir: "sql/migrations", Dir: "../../sql/migrations",
} }
_, err = migrate.Exec(db, databaseDriver, migrations, migrate.Up) _, err = migrate.Exec(db, databaseDialect, migrations, migrate.Up)
return err return err
} }

24
nix/secret-santa.nix Normal file
View file

@ -0,0 +1,24 @@
{
buildGoModule,
lib,
}:
buildGoModule rec {
pname = "secret-santa";
version = "0.0.1";
src = ./..;
vendorHash = "sha256-ZxzjlqylSkQ9Bj0y0eOJYHCuoPKBOtQcpFgGrkAlbr8=";
ldflags = [
"-s"
"-w"
];
doCheck = false;
meta = with lib; {
homepage = "https://git.katuwoss.dev/JustScreaMy/secret-santa";
description = "Secret-santa manager";
license = licenses.mit;
};
}