pkg/config/config.go

@@ -194,6 +194,8 @@ func InitDefaultConfig() {
 	RateLimitLimit.setDefault(100)
 	RateLimitPeriod.setDefault(60)
 	RateLimitStore.setDefault("memory")
+	// Files
+	FilesBasePath.setDefault("./files")
 }
 
 // InitConfig initializes the config, sets defaults etc.

pkg/files/filehandling.go

@@ -21,9 +21,11 @@ import (
 	"code.vikunja.io/api/pkg/db"
 	"code.vikunja.io/api/pkg/log"
 	"github.com/spf13/afero"
+	"github.com/stretchr/testify/assert"
 	"gopkg.in/testfixtures.v2"
 	"os"
 	"path/filepath"
+	"testing"
 )
 
 // This file handles storing and retrieving a file for different backends
@@ -40,12 +42,17 @@ func InitFileHandler() {
 func InitTestFileHandler() {
 	fs = afero.NewMemMapFs()
 	afs = &afero.Afero{Fs: fs}
+}
 
-	// Add some fixed test files
-	err := afero.WriteFile(afs, config.FilesBasePath.GetString()+"/1", []byte("testfile1"), 0644)
-	if err != nil {
-		log.Fatal("Error creating test file: ", err)
-	}
+func initFixtures(t *testing.T) {
+	// Init db fixtures
+	err := db.LoadFixtures()
+	assert.NoError(t, err)
+
+	// Init fixture files
+	filename := config.FilesBasePath.GetString() + "/1"
+	err = afero.WriteFile(afs, filename, []byte("testfile1"), 0644)
+	assert.NoError(t, err)
 }
 
 // InitTests handles the actual bootstrapping of the test env
@@ -74,12 +81,6 @@ func InitTests() {
 		log.Fatal(err)
 	}
 
-	// Load the fixtures
-	err = db.LoadFixtures()
-	if err != nil {
-		log.Fatalf("Error preparing test database: %v", err.Error())
-	}
-
 	InitTestFileHandler()
 }
 

pkg/files/files_test.go

@@ -29,11 +29,13 @@ func TestCreate(t *testing.T) {
 
 func TestFile_Delete(t *testing.T) {
 	t.Run("Normal", func(t *testing.T) {
+		initFixtures(t)
 		f := &File{ID: 1}
 		err := f.Delete()
 		assert.NoError(t, err)
 	})
 	t.Run("Nonexisting", func(t *testing.T) {
+		initFixtures(t)
 		f := &File{ID: 9999}
 		err := f.Delete()
 		assert.Error(t, err)
@@ -43,11 +45,13 @@ func TestFile_Delete(t *testing.T) {
 
 func TestFile_LoadFileByID(t *testing.T) {
 	t.Run("Normal", func(t *testing.T) {
+		initFixtures(t)
 		f := &File{ID: 1}
 		err := f.LoadFileByID()
 		assert.NoError(t, err)
 	})
 	t.Run("Nonexisting", func(t *testing.T) {
+		initFixtures(t)
 		f := &File{ID: 9999}
 		err := f.LoadFileByID()
 		assert.Error(t, err)
@@ -57,12 +61,14 @@ func TestFile_LoadFileByID(t *testing.T) {
 
 func TestFile_LoadFileMetaByID(t *testing.T) {
 	t.Run("Normal", func(t *testing.T) {
+		initFixtures(t)
 		f := &File{ID: 1}
 		err := f.LoadFileMetaByID()
 		assert.NoError(t, err)
 		assert.Equal(t, "test", f.Name)
 	})
 	t.Run("Nonexisting", func(t *testing.T) {
+		initFixtures(t)
 		f := &File{ID: 9999}
 		err := f.LoadFileMetaByID()
 		assert.Error(t, err)