mirror/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-12-01 21:54:04 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

[TESTS] deliver webhooks on localhost

Browse source 
(cherry picked from commit bd97bd875d)
This commit is contained in:
oliverpool 2024-03-31 10:34:37 +02:00 committed by Earl Warren
parent b6dccc0fd4
commit 4706b644f8
No known key found for this signature in database
GPG key ID: 0579CB2928A78A00
1 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
tests/integration/pull_merge_test.go
View file

@ -26,11 +26,14 @@ import (
"code.gitea.io/gitea/models/webhook" "code.gitea.io/gitea/models/webhook"
"code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/git"
"code.gitea.io/gitea/modules/gitrepo" "code.gitea.io/gitea/modules/gitrepo"
"code.gitea.io/gitea/modules/hostmatcher"
"code.gitea.io/gitea/modules/setting"
api "code.gitea.io/gitea/modules/structs" api "code.gitea.io/gitea/modules/structs"
"code.gitea.io/gitea/modules/test" "code.gitea.io/gitea/modules/test"
"code.gitea.io/gitea/modules/translation" "code.gitea.io/gitea/modules/translation"
"code.gitea.io/gitea/services/pull" "code.gitea.io/gitea/services/pull"
files_service "code.gitea.io/gitea/services/repository/files" files_service "code.gitea.io/gitea/services/repository/files"
webhook_service "code.gitea.io/gitea/services/webhook"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
) )
@ -83,7 +86,19 @@ func testPullCleanUp(t *testing.T, session *TestSession, user, repo, pullnum str
func retrieveHookTasks(t *testing.T, hookID int64, activateWebhook bool) []*webhook.HookTask { func retrieveHookTasks(t *testing.T, hookID int64, activateWebhook bool) []*webhook.HookTask {
t.Helper() t.Helper()
if activateWebhook { if activateWebhook {
updated, err := db.GetEngine(db.DefaultContext).ID(hookID).Cols("is_active").Update(webhook.Webhook{IsActive: true}) s := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
w.WriteHeader(http.StatusNoContent)
}))
t.Cleanup(s.Close)
updated, err := db.GetEngine(db.DefaultContext).ID(hookID).Cols("is_active", "url").Update(webhook.Webhook{
IsActive: true,
URL: s.URL,
})
// allow webhook deliveries on localhost
t.Cleanup(test.MockVariableValue(&setting.Webhook.AllowedHostList, hostmatcher.MatchBuiltinLoopback))
webhook_service.Init()
assert.Equal(t, int64(1), updated) assert.Equal(t, int64(1), updated)
assert.NoError(t, err) assert.NoError(t, err)
} }