diff options
author | Christopher Speller <crspeller@gmail.com> | 2016-03-16 18:16:11 -0400 |
---|---|---|
committer | Christopher Speller <crspeller@gmail.com> | 2016-03-16 18:16:11 -0400 |
commit | 4a4859351a4cd277f94d3faa804daaad0733b270 (patch) | |
tree | 4e7f83d3e2564b9b89d669e9f7905ff11768b11a /api | |
parent | 29fe6a3d13c9c7aa490fffebbe5d1b5fdf1e3090 (diff) | |
parent | 12896bd23eeba79884245c1c29fdc568cf21a7fa (diff) | |
download | chat-4a4859351a4cd277f94d3faa804daaad0733b270.tar.gz chat-4a4859351a4cd277f94d3faa804daaad0733b270.tar.bz2 chat-4a4859351a4cd277f94d3faa804daaad0733b270.zip |
Merge pull request #2453 from mattermost/plt-2340
PLT-2340 Converting to Webpack. Stage 1.
Diffstat (limited to 'api')
-rw-r--r-- | api/file_test.go | 6 | ||||
-rw-r--r-- | api/user.go | 2 | ||||
-rw-r--r-- | api/user_test.go | 2 |
3 files changed, 5 insertions, 5 deletions
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) |