summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar tsmethurst <tobi.smethurst@protonmail.com>2021-06-21 20:40:56 +0200
committerLibravatar tsmethurst <tobi.smethurst@protonmail.com>2021-06-21 20:40:56 +0200
commit38912f5d07d1ceaf912d8335fa18c1276ae72f29 (patch)
tree5bb2bfd18a48a4315daaedda82261d8081f15097
parentnew styling for frontpage, update login and authorize templates (#46) (diff)
downloadgotosocial-38912f5d07d1ceaf912d8335fa18c1276ae72f29.tar.xz
add web handler to testrig
-rw-r--r--go.mod2
-rw-r--r--internal/cliactions/testrig/testrig.go3
-rw-r--r--internal/config/default.go1
3 files changed, 5 insertions, 1 deletions
diff --git a/go.mod b/go.mod
index d8ddb3018..4ae1df28f 100644
--- a/go.mod
+++ b/go.mod
@@ -15,7 +15,7 @@ require (
github.com/dsoprea/go-utility v0.0.0-20200717064901-2fccff4aa15e // indirect
github.com/gin-contrib/cors v1.3.1
github.com/gin-contrib/sessions v0.0.3
- github.com/gin-contrib/static v0.0.1 // indirect
+ github.com/gin-contrib/static v0.0.1
github.com/gin-gonic/gin v1.7.2
github.com/go-errors/errors v1.4.0 // indirect
github.com/go-fed/activity v1.0.1-0.20210426194615-e0de0863dcc1
diff --git a/internal/cliactions/testrig/testrig.go b/internal/cliactions/testrig/testrig.go
index b62aec085..04832bfc1 100644
--- a/internal/cliactions/testrig/testrig.go
+++ b/internal/cliactions/testrig/testrig.go
@@ -34,6 +34,7 @@ import (
"github.com/superseriousbusiness/gotosocial/internal/cliactions"
"github.com/superseriousbusiness/gotosocial/internal/config"
"github.com/superseriousbusiness/gotosocial/internal/gotosocial"
+ "github.com/superseriousbusiness/gotosocial/internal/web"
"github.com/superseriousbusiness/gotosocial/testrig"
)
@@ -69,6 +70,7 @@ var Start cliactions.GTSAction = func(ctx context.Context, _ *config.Config, log
appsModule := app.New(c, processor, log)
followRequestsModule := followrequest.New(c, processor, log)
webfingerModule := webfinger.New(c, processor, log)
+ webBaseModule := web.New(c, processor, log)
usersModule := user.New(c, processor, log)
timelineModule := timeline.New(c, processor, log)
notificationModule := notification.New(c, processor, log)
@@ -89,6 +91,7 @@ var Start cliactions.GTSAction = func(ctx context.Context, _ *config.Config, log
authModule,
// now everything else
+ webBaseModule,
accountModule,
instanceModule,
appsModule,
diff --git a/internal/config/default.go b/internal/config/default.go
index 8a53f239e..89360bb26 100644
--- a/internal/config/default.go
+++ b/internal/config/default.go
@@ -172,6 +172,7 @@ func GetTestDefaults() Defaults {
DbDatabase: "postgres",
TemplateBaseDir: "./web/template/",
+ AssetBaseDir: "./web/assets/",
AccountsOpenRegistration: true,
AccountsRequireApproval: true,