From 12896bd23eeba79884245c1c29fdc568cf21a7fa Mon Sep 17 00:00:00 2001 From: Christopher Speller Date: Mon, 14 Mar 2016 08:50:46 -0400 Subject: Converting to Webpack. Stage 1. --- api/file_test.go | 6 +++--- api/user.go | 2 +- api/user_test.go | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'api') diff --git a/api/file_test.go b/api/file_test.go index c3ece7199..4a3eaebfb 100644 --- a/api/file_test.go +++ b/api/file_test.go @@ -43,7 +43,7 @@ func TestUploadFile(t *testing.T) { t.Fatal(err) } - path := utils.FindDir("web/static/images") + path := utils.FindDir("tests") file, err := os.Open(path + "/test.png") defer file.Close() @@ -159,7 +159,7 @@ func TestGetFile(t *testing.T) { t.Fatal(err) } - path := utils.FindDir("web/static/images") + path := utils.FindDir("tests") file, err := os.Open(path + "/test.png") if err != nil { t.Fatal(err) @@ -342,7 +342,7 @@ func TestGetPublicLink(t *testing.T) { t.Fatal(err) } - path := utils.FindDir("web/static/images") + path := utils.FindDir("tests") file, err := os.Open(path + "/test.png") if err != nil { t.Fatal(err) diff --git a/api/user.go b/api/user.go index 0841c38aa..2c8185209 100644 --- a/api/user.go +++ b/api/user.go @@ -1049,7 +1049,7 @@ func createProfileImage(username string, userId string) ([]byte, *model.AppError initial := string(strings.ToUpper(username)[0]) - fontBytes, err := ioutil.ReadFile(utils.FindDir("web/static/fonts") + utils.Cfg.FileSettings.InitialFont) + fontBytes, err := ioutil.ReadFile(utils.FindDir("fonts") + utils.Cfg.FileSettings.InitialFont) if err != nil { return nil, model.NewLocAppError("createProfileImage", "api.user.create_profile_image.default_font.app_error", nil, err.Error()) } diff --git a/api/user_test.go b/api/user_test.go index 27f00829f..a175adb1b 100644 --- a/api/user_test.go +++ b/api/user_test.go @@ -470,7 +470,7 @@ func TestUserUploadProfileImage(t *testing.T) { t.Fatal(err) } - path := utils.FindDir("web/static/images") + path := utils.FindDir("tests") file, err := os.Open(path + "/test.png") if err != nil { t.Fatal(err) -- cgit v1.2.3-1-g7c22