Open platform to collect and prioritize feedback
migrate only once
goenning49c5af604bbe
diff --git a/app/pkg/dbx/dbx.go b/app/pkg/dbx/dbx.goindex 0d23aadb9..8965c388b 100644--- a/app/pkg/dbx/dbx.go+++ b/app/pkg/dbx/dbx.go@@ -23,10 +23,6 @@ func New() (*Database, error) {}db := &Database{conn}- if env.IsTest() {- db.Migrate()- db.load("/app/pkg/dbx/setup.sql")- }return db, nil}@@ -207,6 +203,13 @@ func (db Database) load(path string) {}}+// Seed clean and insert new seed data for testing+func (db Database) Seed() {+ if env.IsTest() {+ db.load("/app/pkg/dbx/setup.sql")+ }+}+// Migrate the database to latest verionfunc (db Database) Migrate() {diff --git a/app/pkg/dbx/dbx_test.go b/app/pkg/dbx/dbx_test.goindex 023679fd3..81f1906c4 100644--- a/app/pkg/dbx/dbx_test.go+++ b/app/pkg/dbx/dbx_test.go@@ -1,6 +1,7 @@package dbx_testimport (+ "os""testing""github.com/WeCanHearYou/wechy/app/pkg/dbx"@@ -24,6 +25,16 @@ type tenant struct {Name string `db:"name"`}+func TestMain(m *testing.M) {+ db, _ := dbx.New()+ db.Migrate()+ db.Seed()+ db.Close()++ code := m.Run()+ os.Exit(code)+}+func TestBind_SimpleStruct(t *testing.T) {RegisterTestingT(t)db, _ := dbx.New()diff --git a/app/storage/postgres/idea_test.go b/app/storage/postgres/idea_test.goindex db35c22a9..dd580a98f 100644--- a/app/storage/postgres/idea_test.go+++ b/app/storage/postgres/idea_test.go@@ -14,6 +14,7 @@ import (func TestIdeaStorage_GetAll(t *testing.T) {RegisterTestingT(t)db, _ := dbx.New()+ db.Seed()defer db.Close()now := time.Now()@@ -45,6 +46,7 @@ func TestIdeaStorage_GetAll(t *testing.T) {func TestIdeaStorage_SaveAndGet(t *testing.T) {RegisterTestingT(t)db, _ := dbx.New()+ db.Seed()defer db.Close()db.Execute("INSERT INTO tenants (name, subdomain, created_on) VALUES ('My Domain Inc.','mydomain', now())")@@ -72,6 +74,7 @@ func TestIdeaStorage_SaveAndGet(t *testing.T) {func TestIdeaStorage_GetInvalid(t *testing.T) {RegisterTestingT(t)db, _ := dbx.New()+ db.Seed()defer db.Close()ideas := &postgres.IdeaStorage{DB: db}@@ -84,6 +87,7 @@ func TestIdeaStorage_GetInvalid(t *testing.T) {func TestIdeaStorage_AddAndReturnComments(t *testing.T) {RegisterTestingT(t)db, _ := dbx.New()+ db.Seed()defer db.Close()db.Execute("INSERT INTO tenants (name, subdomain, created_on) VALUES ('My Domain Inc.','mydomain', now())")@@ -105,6 +109,7 @@ func TestIdeaStorage_AddAndReturnComments(t *testing.T) {func TestIdeaStorage_SaveAndGet_DifferentTenants(t *testing.T) {RegisterTestingT(t)db, _ := dbx.New()+ db.Seed()defer db.Close()ideas := &postgres.IdeaStorage{DB: db}@@ -129,6 +134,7 @@ func TestIdeaStorage_SaveAndGet_DifferentTenants(t *testing.T) {func TestIdeaStorage_AddSupporter(t *testing.T) {RegisterTestingT(t)db, _ := dbx.New()+ db.Seed()defer db.Close()ideas := &postgres.IdeaStorage{DB: db}@@ -148,6 +154,7 @@ func TestIdeaStorage_AddSupporter(t *testing.T) {func TestIdeaStorage_AddSupporter_Twice(t *testing.T) {RegisterTestingT(t)db, _ := dbx.New()+ db.Seed()defer db.Close()ideas := &postgres.IdeaStorage{DB: db}@@ -167,6 +174,7 @@ func TestIdeaStorage_AddSupporter_Twice(t *testing.T) {func TestIdeaStorage_RemoveSupporter(t *testing.T) {RegisterTestingT(t)db, _ := dbx.New()+ db.Seed()defer db.Close()ideas := &postgres.IdeaStorage{DB: db}@@ -186,6 +194,7 @@ func TestIdeaStorage_RemoveSupporter(t *testing.T) {func TestIdeaStorage_RemoveSupporter_Twice(t *testing.T) {RegisterTestingT(t)db, _ := dbx.New()+ db.Seed()defer db.Close()ideas := &postgres.IdeaStorage{DB: db}diff --git a/app/storage/postgres/tenant_test.go b/app/storage/postgres/tenant_test.goindex be91293ec..b1feaf775 100644--- a/app/storage/postgres/tenant_test.go+++ b/app/storage/postgres/tenant_test.go@@ -15,6 +15,7 @@ import (func TestTenantStorage_First(t *testing.T) {RegisterTestingT(t)db, _ := dbx.New()+ db.Seed()defer db.Close()tenants := &postgres.TenantStorage{DB: db}@@ -27,6 +28,7 @@ func TestTenantStorage_First(t *testing.T) {func TestTenantStorage_Empty_First(t *testing.T) {RegisterTestingT(t)db, _ := dbx.New()+ db.Seed()defer db.Close()db.Execute("TRUNCATE tenants CASCADE")@@ -41,6 +43,7 @@ func TestTenantStorage_Empty_First(t *testing.T) {func TestTenantStorage_GetByDomain_NotFound(t *testing.T) {RegisterTestingT(t)db, _ := dbx.New()+ db.Seed()defer db.Close()tenants := &postgres.TenantStorage{DB: db}@@ -53,6 +56,7 @@ func TestTenantStorage_GetByDomain_NotFound(t *testing.T) {func TestTenantStorage_GetByDomain_Subdomain(t *testing.T) {RegisterTestingT(t)db, _ := dbx.New()+ db.Seed()defer db.Close()tenants := &postgres.TenantStorage{DB: db}@@ -73,6 +77,7 @@ func TestTenantStorage_GetByDomain_Subdomain(t *testing.T) {func TestTenantStorage_GetByDomain_FullDomain(t *testing.T) {RegisterTestingT(t)db, _ := dbx.New()+ db.Seed()defer db.Close()tenants := &postgres.TenantStorage{DB: db}diff --git a/app/storage/postgres/user_test.go b/app/storage/postgres/user_test.goindex 657e724f2..1775a3faf 100644--- a/app/storage/postgres/user_test.go+++ b/app/storage/postgres/user_test.go@@ -13,6 +13,7 @@ import (func TestUserStorage_GetByID(t *testing.T) {RegisterTestingT(t)db, _ := dbx.New()+ db.Seed()defer db.Close()users := &postgres.UserStorage{DB: db}@@ -31,6 +32,7 @@ func TestUserStorage_GetByID(t *testing.T) {func TestUserStorage_GetByEmail_Error(t *testing.T) {RegisterTestingT(t)db, _ := dbx.New()+ db.Seed()defer db.Close()users := &postgres.UserStorage{DB: db}@@ -43,6 +45,7 @@ func TestUserStorage_GetByEmail_Error(t *testing.T) {func TestUserStorage_GetByEmail(t *testing.T) {RegisterTestingT(t)db, _ := dbx.New()+ db.Seed()defer db.Close()users := &postgres.UserStorage{DB: db}@@ -61,6 +64,7 @@ func TestUserStorage_GetByEmail(t *testing.T) {func TestUserStorage_GetByEmail_WrongTenant(t *testing.T) {RegisterTestingT(t)db, _ := dbx.New()+ db.Seed()defer db.Close()users := &postgres.UserStorage{DB: db}@@ -73,6 +77,7 @@ func TestUserStorage_GetByEmail_WrongTenant(t *testing.T) {func TestUserStorage_Register(t *testing.T) {RegisterTestingT(t)db, _ := dbx.New()+ db.Seed()defer db.Close()users := &postgres.UserStorage{DB: db}@@ -104,6 +109,7 @@ func TestUserStorage_Register(t *testing.T) {func TestUserStorage_Register_MultipleProviders(t *testing.T) {RegisterTestingT(t)db, _ := dbx.New()+ db.Seed()defer db.Close()db.Execute("INSERT INTO tenants (name, subdomain, created_on) VALUES ('My Domain Inc.','mydomain', now())")@@ -138,6 +144,7 @@ func TestUserStorage_Register_MultipleProviders(t *testing.T) {func TestUserStorage_RegisterProvider(t *testing.T) {RegisterTestingT(t)db, _ := dbx.New()+ db.Seed()defer db.Close()users := &postgres.UserStorage{DB: db}