From 297ffda5adf67ebdac506c3dee5c1307b58d3fc3 Mon Sep 17 00:00:00 2001
From: Tit Petric <black@scene-si.org>
Date: Sat, 24 Nov 2018 19:50:07 +0000
Subject: [PATCH] add(all): migrations for tests, statik update

---
 sam/db/migrate.go           |  7 ++++---
 sam/repository/main_test.go | 25 +++++++++++++++++++++----
 system/db/migrate.go        |  7 ++++---
 3 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/sam/db/migrate.go b/sam/db/migrate.go
index 1c8ef9750..d4a33d303 100644
--- a/sam/db/migrate.go
+++ b/sam/db/migrate.go
@@ -9,10 +9,11 @@ import (
 	"sort"
 	"strings"
 
-	_ "github.com/crusttech/crust/sam/db/mysql"
 	"github.com/pkg/errors"
-	"github.com/rakyll/statik/fs"
 	"github.com/titpetric/factory"
+	"github.com/titpetric/statik/fs"
+
+	"github.com/crusttech/crust/sam/db/mysql"
 )
 
 func statements(contents []byte, err error) ([]string, error) {
@@ -23,7 +24,7 @@ func statements(contents []byte, err error) ([]string, error) {
 }
 
 func Migrate(db *factory.DB) error {
-	statikFS, err := fs.New()
+	statikFS, err := fs.New(mysql.Data())
 	if err != nil {
 		return errors.Wrap(err, "Error creating statik filesystem")
 	}
diff --git a/sam/repository/main_test.go b/sam/repository/main_test.go
index f8ea4c276..c803c8b58 100644
--- a/sam/repository/main_test.go
+++ b/sam/repository/main_test.go
@@ -2,12 +2,17 @@ package repository
 
 import (
 	"fmt"
-	"github.com/joho/godotenv"
-	"github.com/namsral/flag"
-	"github.com/titpetric/factory"
+	"log"
 	"os"
 	"runtime"
 	"testing"
+
+	"github.com/joho/godotenv"
+	"github.com/namsral/flag"
+	"github.com/titpetric/factory"
+
+	samMigrate "github.com/crusttech/crust/sam/db"
+	systemMigrate "github.com/crusttech/crust/system/db"
 )
 
 func TestMain(m *testing.M) {
@@ -29,7 +34,19 @@ func TestMain(m *testing.M) {
 	}
 
 	factory.Database.Add("default", dsn)
-	factory.Database.MustGet().Profiler = &factory.Database.ProfilerStdout
+
+	db := factory.Database.MustGet()
+	db.Profiler = &factory.Database.ProfilerStdout
+
+	// migrate database schema
+	if err := systemMigrate.Migrate(db); err != nil {
+		log.Printf("Error running migrations: %+v\n", err)
+		return
+	}
+	if err := samMigrate.Migrate(db); err != nil {
+		log.Printf("Error running migrations: %+v\n", err)
+		return
+	}
 
 	os.Exit(m.Run())
 }
diff --git a/system/db/migrate.go b/system/db/migrate.go
index 248803fcc..78d6fe66a 100644
--- a/system/db/migrate.go
+++ b/system/db/migrate.go
@@ -9,10 +9,11 @@ import (
 	"sort"
 	"strings"
 
-	_ "github.com/crusttech/crust/system/db/mysql"
 	"github.com/pkg/errors"
-	"github.com/rakyll/statik/fs"
 	"github.com/titpetric/factory"
+	"github.com/titpetric/statik/fs"
+
+	"github.com/crusttech/crust/system/db/mysql"
 )
 
 func statements(contents []byte, err error) ([]string, error) {
@@ -23,7 +24,7 @@ func statements(contents []byte, err error) ([]string, error) {
 }
 
 func Migrate(db *factory.DB) error {
-	statikFS, err := fs.New()
+	statikFS, err := fs.New(mysql.Data())
 	if err != nil {
 		return errors.Wrap(err, "Error creating statik filesystem")
 	}