From bb0e0a05b0db59bcc885b077f998df46319b1bfa Mon Sep 17 00:00:00 2001 From: Umputun Date: Sat, 17 Feb 2018 18:30:07 -0600 Subject: [PATCH] test for full path avatars --- app/main.go | 3 ++- app/rest/auth/avatar_test.go | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/main.go b/app/main.go index 923fda38..c60e41c8 100644 --- a/app/main.go +++ b/app/main.go @@ -5,6 +5,7 @@ import ( "log" "net/http" "os" + "strings" "time" "github.com/umputun/remark/app/notifier" @@ -103,7 +104,7 @@ func main() { avatarProxy := &auth.AvatarProxy{ StorePath: opts.ServerCommand.AvatarStore, RoutePath: "/api/v1/avatar", - RemarkURL: opts.RemarkURL, + RemarkURL: strings.TrimSuffix(opts.RemarkURL, "/"), DefaultAvatar: opts.ServerCommand.DefaultAvatar, } diff --git a/app/rest/auth/avatar_test.go b/app/rest/auth/avatar_test.go index af90460d..128617f1 100644 --- a/app/rest/auth/avatar_test.go +++ b/app/rest/auth/avatar_test.go @@ -15,14 +15,14 @@ import ( ) func TestPut(t *testing.T) { - p := AvatarProxy{StorePath: "/tmp/avatars.test", RoutePath: "/avatar"} + p := AvatarProxy{StorePath: "/tmp/avatars.test", RoutePath: "/avatar", RemarkURL: "http://localhost:8080"} os.MkdirAll("/tmp/avatars.test", 0700) defer os.RemoveAll("/tmp/avatars.test") u := store.User{ID: "user1", Name: "user1 name", Picture: "https://friends.radio-t.com/resources/images/rt_logo_64.png"} res, err := p.Put(u) assert.NoError(t, err) - assert.Equal(t, "/avatar/b3daa77b4c04a9551b8781d03191fe098f325e67.image", res) + assert.Equal(t, "http://localhost:8080/avatar/b3daa77b4c04a9551b8781d03191fe098f325e67.image", res) fi, err := os.Stat("/tmp/avatars.test/30/b3daa77b4c04a9551b8781d03191fe098f325e67.image") assert.NoError(t, err) assert.Equal(t, int64(8432), fi.Size()) @@ -30,7 +30,7 @@ func TestPut(t *testing.T) { u.ID = "user2" res, err = p.Put(u) assert.NoError(t, err) - assert.Equal(t, "/avatar/a1881c06eec96db9901c7bbfe41c42a3f08e9cb4.image", res) + assert.Equal(t, "http://localhost:8080/avatar/a1881c06eec96db9901c7bbfe41c42a3f08e9cb4.image", res) fi, err = os.Stat("/tmp/avatars.test/84/a1881c06eec96db9901c7bbfe41c42a3f08e9cb4.image") assert.NoError(t, err) assert.Equal(t, int64(8432), fi.Size())