From 19e73378d34cb6674ce7902a28092f804f135800 Mon Sep 17 00:00:00 2001 From: Hayden <64056131+hay-kot@users.noreply.github.com> Date: Sun, 25 Sep 2022 21:20:09 -0800 Subject: [PATCH] cleanup unnecessary mocks --- backend/app/api/v1/main_test.go | 18 ++++++++++++------ backend/internal/mocks/mocker_services.go | 10 ---------- backend/internal/mocks/mocks_ent_repo.go | 22 ---------------------- 3 files changed, 12 insertions(+), 38 deletions(-) delete mode 100644 backend/internal/mocks/mocker_services.go delete mode 100644 backend/internal/mocks/mocks_ent_repo.go diff --git a/backend/app/api/v1/main_test.go b/backend/app/api/v1/main_test.go index ee08ccd..652109a 100644 --- a/backend/app/api/v1/main_test.go +++ b/backend/app/api/v1/main_test.go @@ -5,8 +5,9 @@ import ( "testing" "github.com/hay-kot/homebox/backend/ent" - "github.com/hay-kot/homebox/backend/internal/mocks" "github.com/hay-kot/homebox/backend/internal/mocks/factories" + "github.com/hay-kot/homebox/backend/internal/repo" + "github.com/hay-kot/homebox/backend/internal/services" "github.com/hay-kot/homebox/backend/internal/types" ) @@ -39,12 +40,17 @@ func userPool() func() { func TestMain(m *testing.M) { // Set Handler Vars - repos, closeDb := mocks.GetEntRepos() - mockHandler.svc = mocks.GetMockServices(repos) + c, err := ent.Open("sqlite3", "file:ent?mode=memory&cache=shared&_fk=1") + if err != nil { + panic(err) + } - defer func() { - _ = closeDb() - }() + if err := c.Schema.Create(context.Background()); err != nil { + panic(err) + } + + repos := repo.EntAllRepos(c, "/tmp/homebox") + mockHandler.svc = services.NewServices(repos) purge := userPool() defer purge() diff --git a/backend/internal/mocks/mocker_services.go b/backend/internal/mocks/mocker_services.go deleted file mode 100644 index d1e80bd..0000000 --- a/backend/internal/mocks/mocker_services.go +++ /dev/null @@ -1,10 +0,0 @@ -package mocks - -import ( - "github.com/hay-kot/homebox/backend/internal/repo" - "github.com/hay-kot/homebox/backend/internal/services" -) - -func GetMockServices(repos *repo.AllRepos) *services.AllServices { - return services.NewServices(repos, "/tmp/homebox") -} diff --git a/backend/internal/mocks/mocks_ent_repo.go b/backend/internal/mocks/mocks_ent_repo.go deleted file mode 100644 index 4b7abcc..0000000 --- a/backend/internal/mocks/mocks_ent_repo.go +++ /dev/null @@ -1,22 +0,0 @@ -package mocks - -import ( - "context" - - "github.com/hay-kot/homebox/backend/ent" - "github.com/hay-kot/homebox/backend/internal/repo" - _ "github.com/mattn/go-sqlite3" -) - -func GetEntRepos() (*repo.AllRepos, func() error) { - c, err := ent.Open("sqlite3", "file:ent?mode=memory&cache=shared&_fk=1") - if err != nil { - panic(err) - } - - if err := c.Schema.Create(context.Background()); err != nil { - panic(err) - } - - return repo.EntAllRepos(c), c.Close -}