From cae80e385e7bf16c4fd0016f63dfa5882f2dc00b Mon Sep 17 00:00:00 2001 From: cblgh Date: Mon, 26 Apr 2021 08:28:42 +0200 Subject: [PATCH] make alias mockdb return alias entry --- web/errors/errhandler.go | 2 +- web/handlers/admin/aliases_test.go | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/web/errors/errhandler.go b/web/errors/errhandler.go index 4918f97..37b0d2d 100644 --- a/web/errors/errhandler.go +++ b/web/errors/errhandler.go @@ -34,7 +34,7 @@ func (eh *ErrorHandler) SetRenderer(r *render.Renderer) { func (eh *ErrorHandler) Handle(rw http.ResponseWriter, req *http.Request, code int, err error) { log := logging.FromContext(req.Context()) - level.Error(log).Log("event", "handling error","path", req.URL.Path, "err",err) + level.Error(log).Log("event", "handling error", "path", req.URL.Path, "err", err) var redirectErr ErrRedirect if errors.As(err, &redirectErr) { if redirectErr.Reason != nil { diff --git a/web/handlers/admin/aliases_test.go b/web/handlers/admin/aliases_test.go index 836915a..8bf6888 100644 --- a/web/handlers/admin/aliases_test.go +++ b/web/handlers/admin/aliases_test.go @@ -53,7 +53,13 @@ func TestAliasesRevoke(t *testing.T) { urlRevoke := ts.URLTo(router.AdminAliasesRevoke) overviewURL := ts.URLTo(router.AdminMembersOverview) + aliasEntry := roomdb.Alias{ + ID: ts.User.ID, + Feed: ts.User.PubKey, + Name: "Blobby", + } ts.AliasesDB.RevokeReturns(nil) + ts.AliasesDB.ResolveReturns(aliasEntry, nil) addVals := url.Values{"name": []string{"the-name"}} rec := ts.Client.PostForm(urlRevoke, addVals)