From 1adfd0e9be69a93c7f63bb7afc742c9fafe31aa3 Mon Sep 17 00:00:00 2001 From: Chris Date: Wed, 6 Sep 2017 17:12:54 -0500 Subject: app type transition (#7167) --- app/file_test.go | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'app/file_test.go') diff --git a/app/file_test.go b/app/file_test.go index 962661039..52f42707c 100644 --- a/app/file_test.go +++ b/app/file_test.go @@ -36,7 +36,8 @@ func TestGeneratePublicLinkHash(t *testing.T) { } func TestDoUploadFile(t *testing.T) { - Setup() + a := Global() + a.Setup() teamId := model.NewId() channelId := model.NewId() @@ -44,12 +45,12 @@ func TestDoUploadFile(t *testing.T) { filename := "test" data := []byte("abcd") - info1, err := DoUploadFile(time.Date(2007, 2, 4, 1, 2, 3, 4, time.Local), teamId, channelId, userId, filename, data) + info1, err := a.DoUploadFile(time.Date(2007, 2, 4, 1, 2, 3, 4, time.Local), teamId, channelId, userId, filename, data) if err != nil { t.Fatal(err) } else { defer func() { - <-Srv.Store.FileInfo().PermanentDelete(info1.Id) + <-a.Srv.Store.FileInfo().PermanentDelete(info1.Id) utils.RemoveFile(info1.Path) }() } @@ -58,12 +59,12 @@ func TestDoUploadFile(t *testing.T) { t.Fatal("stored file at incorrect path", info1.Path) } - info2, err := DoUploadFile(time.Date(2007, 2, 4, 1, 2, 3, 4, time.Local), teamId, channelId, userId, filename, data) + info2, err := a.DoUploadFile(time.Date(2007, 2, 4, 1, 2, 3, 4, time.Local), teamId, channelId, userId, filename, data) if err != nil { t.Fatal(err) } else { defer func() { - <-Srv.Store.FileInfo().PermanentDelete(info2.Id) + <-a.Srv.Store.FileInfo().PermanentDelete(info2.Id) utils.RemoveFile(info2.Path) }() } @@ -72,12 +73,12 @@ func TestDoUploadFile(t *testing.T) { t.Fatal("stored file at incorrect path", info2.Path) } - info3, err := DoUploadFile(time.Date(2008, 3, 5, 1, 2, 3, 4, time.Local), teamId, channelId, userId, filename, data) + info3, err := a.DoUploadFile(time.Date(2008, 3, 5, 1, 2, 3, 4, time.Local), teamId, channelId, userId, filename, data) if err != nil { t.Fatal(err) } else { defer func() { - <-Srv.Store.FileInfo().PermanentDelete(info3.Id) + <-a.Srv.Store.FileInfo().PermanentDelete(info3.Id) utils.RemoveFile(info3.Path) }() } -- cgit v1.2.3-1-g7c22