@@ -15,18 +15,21 @@ import (
1515 user_model "code.gitea.io/gitea/models/user"
1616 "code.gitea.io/gitea/modules/activitypub"
1717 "code.gitea.io/gitea/modules/setting"
18+ "code.gitea.io/gitea/routers"
1819
1920 ap "github.com/go-ap/activitypub"
2021 "github.com/stretchr/testify/assert"
2122)
2223
2324func TestActivityPubPerson (t * testing.T ) {
24- onGiteaRun (t , func (* testing.T , * url.URL ) {
25- setting .Federation .Enabled = true
26- defer func () {
27- setting .Federation .Enabled = false
28- }()
25+ setting .Federation .Enabled = true
26+ c = routers .NormalRoutes ()
27+ defer func () {
28+ setting .Federation .Enabled = false
29+ c = routers .NormalRoutes ()
30+ }()
2931
32+ onGiteaRun (t , func (* testing.T , * url.URL ) {
3033 username := "user2"
3134 req := NewRequestf (t , "GET" , fmt .Sprintf ("/api/v1/activitypub/user/%s" , username ))
3235 resp := MakeRequest (t , req , http .StatusOK )
@@ -56,28 +59,35 @@ func TestActivityPubPerson(t *testing.T) {
5659}
5760
5861func TestActivityPubMissingPerson (t * testing.T ) {
59- onGiteaRun (t , func (* testing.T , * url.URL ) {
60- setting .Federation .Enabled = true
61- defer func () {
62- setting .Federation .Enabled = false
63- }()
62+ setting .Federation .Enabled = true
63+ c = routers .NormalRoutes ()
64+ defer func () {
65+ setting .Federation .Enabled = false
66+ c = routers .NormalRoutes ()
67+ }()
6468
69+ onGiteaRun (t , func (* testing.T , * url.URL ) {
6570 req := NewRequestf (t , "GET" , "/api/v1/activitypub/user/nonexistentuser" )
6671 resp := MakeRequest (t , req , http .StatusNotFound )
6772 assert .Contains (t , resp .Body .String (), "user redirect does not exist" )
6873 })
6974}
7075
7176func TestActivityPubPersonInbox (t * testing.T ) {
77+ setting .Federation .Enabled = true
78+ c = routers .NormalRoutes ()
79+ defer func () {
80+ setting .Federation .Enabled = false
81+ c = routers .NormalRoutes ()
82+ }()
83+
7284 srv := httptest .NewServer (c )
7385 defer srv .Close ()
7486
7587 onGiteaRun (t , func (* testing.T , * url.URL ) {
7688 appURL := setting .AppURL
77- setting .Federation .Enabled = true
7889 setting .AppURL = srv .URL
7990 defer func () {
80- setting .Federation .Enabled = false
8191 setting .Database .LogSQL = false
8292 setting .AppURL = appURL
8393 }()
0 commit comments