summaryrefslogtreecommitdiff
path: root/testrig/router.go
diff options
context:
space:
mode:
authorLibravatar tobi <31960611+tsmethurst@users.noreply.github.com>2022-06-08 20:38:03 +0200
committerLibravatar GitHub <noreply@github.com>2022-06-08 20:38:03 +0200
commit1ede54ddf6dfd2d4ba039eb7e23b74bcac65b643 (patch)
tree727436fb9bf9da25e30c5ded65c5b5ccaffe0cf0 /testrig/router.go
parent[bugfix] #621: add weak type handing to mapstructure decode (#625) (diff)
downloadgotosocial-1ede54ddf6dfd2d4ba039eb7e23b74bcac65b643.tar.xz
[feature] More consistent API error handling (#637)
* update templates * start reworking api error handling * update template * return AP status at web endpoint if negotiated * start making api error handling much more consistent * update account endpoints to new error handling * use new api error handling in admin endpoints * go fmt ./... * use api error logic in app * use generic error handling in auth * don't export generic error handler * don't defer clearing session * user nicer error handling on oidc callback handler * tidy up the sign in handler * tidy up the token handler * use nicer error handling in blocksget * auth emojis endpoint * fix up remaining api endpoints * fix whoopsie during login flow * regenerate swagger docs * change http error logging to debug
Diffstat (limited to 'testrig/router.go')
-rw-r--r--testrig/router.go24
1 files changed, 2 insertions, 22 deletions
diff --git a/testrig/router.go b/testrig/router.go
index e06e21bd4..5ab228611 100644
--- a/testrig/router.go
+++ b/testrig/router.go
@@ -20,10 +20,8 @@ package testrig
import (
"context"
- "fmt"
"os"
"path/filepath"
- "runtime"
"github.com/gin-gonic/gin"
"github.com/superseriousbusiness/gotosocial/internal/config"
@@ -54,25 +52,7 @@ func NewTestRouter(db db.DB) router.Router {
}
// ConfigureTemplatesWithGin will panic on any errors related to template loading during tests
-func ConfigureTemplatesWithGin(engine *gin.Engine) {
+func ConfigureTemplatesWithGin(engine *gin.Engine, templatePath string) {
router.LoadTemplateFunctions(engine)
-
- templateBaseDir := config.GetWebTemplateBaseDir()
-
- if !filepath.IsAbs(templateBaseDir) {
- // https://stackoverflow.com/questions/31873396/is-it-possible-to-get-the-current-root-of-package-structure-as-a-string-in-golan
- _, runtimeCallerLocation, _, _ := runtime.Caller(0)
- projectRoot, err := filepath.Abs(filepath.Join(filepath.Dir(runtimeCallerLocation), "../"))
- if err != nil {
- panic(err)
- }
-
- templateBaseDir = filepath.Join(projectRoot, templateBaseDir)
- }
-
- if _, err := os.Stat(filepath.Join(templateBaseDir, "index.tmpl")); err != nil {
- panic(fmt.Errorf("%s doesn't seem to contain the templates; index.tmpl is missing: %w", templateBaseDir, err))
- }
-
- engine.LoadHTMLGlob(filepath.Join(templateBaseDir, "*"))
+ engine.LoadHTMLGlob(filepath.Join(templatePath, "*"))
}