From cd7e9832d2fca37401ded46e54a20f25fb78d60f Mon Sep 17 00:00:00 2001 From: Umputun Date: Wed, 25 Jul 2018 13:17:42 -0400 Subject: [PATCH] add avatart removal path to deleteMe test --- backend/app/rest/api/admin.go | 4 ++-- backend/app/rest/api/admin_test.go | 9 ++++++++- backend/app/rest/api/middleware_test.go | 4 ++-- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/backend/app/rest/api/admin.go b/backend/app/rest/api/admin.go index f979aec3..814a1323 100644 --- a/backend/app/rest/api/admin.go +++ b/backend/app/rest/api/admin.go @@ -12,12 +12,12 @@ import ( "github.com/go-chi/chi" "github.com/go-chi/render" - "github.com/umputun/remark/backend/app/rest/auth" - "github.com/umputun/remark/backend/app/rest/proxy" "github.com/umputun/remark/backend/app/migrator" "github.com/umputun/remark/backend/app/rest" + "github.com/umputun/remark/backend/app/rest/auth" "github.com/umputun/remark/backend/app/rest/cache" + "github.com/umputun/remark/backend/app/rest/proxy" "github.com/umputun/remark/backend/app/store" "github.com/umputun/remark/backend/app/store/service" ) diff --git a/backend/app/rest/api/admin_test.go b/backend/app/rest/api/admin_test.go index d3cc64ec..a5805783 100644 --- a/backend/app/rest/api/admin_test.go +++ b/backend/app/rest/api/admin_test.go @@ -6,6 +6,7 @@ import ( "fmt" "io/ioutil" "net/http" + "os" "strings" "testing" "time" @@ -13,6 +14,7 @@ import ( "github.com/dgrijalva/jwt-go" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "github.com/umputun/remark/backend/app/rest/auth" "github.com/umputun/remark/backend/app/store" ) @@ -495,11 +497,16 @@ func TestAdmin_DeleteMeRequest(t *testing.T) { ExpiresAt: time.Now().Add(30 * time.Minute).Unix(), }, User: &store.User{ - ID: "user1", + ID: "user1", + Picture: "pic.image", }, } claims.Flags.DeleteMe = true + _ = os.MkdirAll("/tmp/42", 0700) + defer os.RemoveAll("/tmp/42") + ioutil.WriteFile("/tmp/42/pic.image", []byte("some image data"), 0600) + token, err := srv.Authenticator.JWTService.Token(&claims) assert.Nil(t, err) diff --git a/backend/app/rest/api/middleware_test.go b/backend/app/rest/api/middleware_test.go index 22e6a53d..aa10fb01 100644 --- a/backend/app/rest/api/middleware_test.go +++ b/backend/app/rest/api/middleware_test.go @@ -9,10 +9,10 @@ import ( "github.com/go-chi/chi" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "github.com/umputun/remark/backend/app/rest" "github.com/umputun/remark/backend/app/store" - - "github.com/stretchr/testify/require" ) func TestMiddleware_AppInfo(t *testing.T) {