Nulo/forgejo
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

webhook: add org tests

Browse source 
(cherry picked from commit 7d95cf6472fbf5b6713a037b52a466e25cef650c)
This commit is contained in:
oliverpool 2024-04-09 11:19:52 +02:00 committed by GitHub
parent f3a4134049
commit 373200e986
1 changed files with 89 additions and 80 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
tests/integration/repo_webhook_test.go
View file

@ -288,9 +288,19 @@ func assertInput(t testing.TB, form *goquery.Selection, name string) string {
func testWebhookForms(name string, session *TestSession, validFields map[string]string, invalidPatches ...map[string]string) func(t *testing.T) { func testWebhookForms(name string, session *TestSession, validFields map[string]string, invalidPatches ...map[string]string) func(t *testing.T) {
return func(t *testing.T) { return func(t *testing.T) {
t.Run("repo1", func(t *testing.T) {
testWebhookFormsShared(t, "/user2/repo1/settings/hooks", name, session, validFields, invalidPatches...)
})
t.Run("org3", func(t *testing.T) {
testWebhookFormsShared(t, "/org/org3/settings/hooks", name, session, validFields, invalidPatches...)
})
}
}
func testWebhookFormsShared(t *testing.T, endpoint, name string, session *TestSession, validFields map[string]string, invalidPatches ...map[string]string) {
// new webhook form // new webhook form
resp := session.MakeRequest(t, NewRequest(t, "GET", "/user2/repo1/settings/hooks/"+name+"/new"), http.StatusOK) resp := session.MakeRequest(t, NewRequest(t, "GET", endpoint+"/"+name+"/new"), http.StatusOK)
htmlForm := NewHTMLParser(t, resp.Body).Find(`form[action^="/user2/repo1/settings/hooks/"]`) htmlForm := NewHTMLParser(t, resp.Body).Find(`form[action^="` + endpoint + `/"]`)
// fill the form // fill the form
payload := map[string]string{ payload := map[string]string{
@ -306,19 +316,19 @@ func testWebhookForms(name string, session *TestSession, validFields map[string]
} }
// create the webhook (this redirects back to the hook list) // create the webhook (this redirects back to the hook list)
resp = session.MakeRequest(t, NewRequestWithValues(t, "POST", "/user2/repo1/settings/hooks/"+name+"/new", payload), http.StatusSeeOther) resp = session.MakeRequest(t, NewRequestWithValues(t, "POST", endpoint+"/"+name+"/new", payload), http.StatusSeeOther)
assertHasFlashMessages(t, resp, "success") assertHasFlashMessages(t, resp, "success")
// find last created hook in the hook list // find last created hook in the hook list
// (a bit hacky, but the list should be sorted) // (a bit hacky, but the list should be sorted)
resp = session.MakeRequest(t, NewRequest(t, "GET", "/user2/repo1/settings/hooks"), http.StatusOK) resp = session.MakeRequest(t, NewRequest(t, "GET", endpoint), http.StatusOK)
htmlDoc := NewHTMLParser(t, resp.Body) htmlDoc := NewHTMLParser(t, resp.Body)
editFormURL := htmlDoc.Find(`a[href^="/user2/repo1/settings/hooks/"]`).Last().AttrOr("href", "") editFormURL := htmlDoc.Find(`a[href^="`+endpoint+`/"]`).Last().AttrOr("href", "")
assert.NotEmpty(t, editFormURL) assert.NotEmpty(t, editFormURL)
// edit webhook form // edit webhook form
resp = session.MakeRequest(t, NewRequest(t, "GET", editFormURL), http.StatusOK) resp = session.MakeRequest(t, NewRequest(t, "GET", editFormURL), http.StatusOK)
htmlForm = NewHTMLParser(t, resp.Body).Find(`form[action^="/user2/repo1/settings/hooks/"]`) htmlForm = NewHTMLParser(t, resp.Body).Find(`form[action^="` + endpoint + `/"]`)
editPostURL := htmlForm.AttrOr("action", "") editPostURL := htmlForm.AttrOr("action", "")
assert.NotEmpty(t, editPostURL) assert.NotEmpty(t, editPostURL)
@ -338,15 +348,15 @@ func testWebhookForms(name string, session *TestSession, validFields map[string]
// check the updated webhook // check the updated webhook
resp = session.MakeRequest(t, NewRequest(t, "GET", editFormURL), http.StatusOK) resp = session.MakeRequest(t, NewRequest(t, "GET", editFormURL), http.StatusOK)
htmlForm = NewHTMLParser(t, resp.Body).Find(`form[action^="/user2/repo1/settings/hooks/"]`) htmlForm = NewHTMLParser(t, resp.Body).Find(`form[action^="` + endpoint + `/"]`)
for k, v := range validFields { for k, v := range validFields {
assert.Equal(t, v, assertInput(t, htmlForm, k), "input %q did not contain value %q", k, v) assert.Equal(t, v, assertInput(t, htmlForm, k), "input %q did not contain value %q", k, v)
} }
if len(invalidPatches) > 0 { if len(invalidPatches) > 0 {
// check that invalid fields are rejected // check that invalid fields are rejected
resp := session.MakeRequest(t, NewRequest(t, "GET", "/user2/repo1/settings/hooks/"+name+"/new"), http.StatusOK) resp := session.MakeRequest(t, NewRequest(t, "GET", endpoint+"/"+name+"/new"), http.StatusOK)
htmlForm := NewHTMLParser(t, resp.Body).Find(`form[action^="/user2/repo1/settings/hooks/"]`) htmlForm := NewHTMLParser(t, resp.Body).Find(`form[action^="` + endpoint + `/"]`)
for _, invalidPatch := range invalidPatches { for _, invalidPatch := range invalidPatches {
t.Run("invalid", func(t *testing.T) { t.Run("invalid", func(t *testing.T) {
@ -366,9 +376,9 @@ func testWebhookForms(name string, session *TestSession, validFields map[string]
} }
} }
resp := session.MakeRequest(t, NewRequestWithValues(t, "POST", "/user2/repo1/settings/hooks/"+name+"/new", payload), http.StatusUnprocessableEntity) resp := session.MakeRequest(t, NewRequestWithValues(t, "POST", endpoint+"/"+name+"/new", payload), http.StatusUnprocessableEntity)
// check that the invalid form is pre-filled // check that the invalid form is pre-filled
htmlForm = NewHTMLParser(t, resp.Body).Find(`form[action^="/user2/repo1/settings/hooks/"]`) htmlForm = NewHTMLParser(t, resp.Body).Find(`form[action^="` + endpoint + `/"]`)
for k, v := range payload { for k, v := range payload {
if k == "_csrf" || k == "events" || v == "" { if k == "_csrf" || k == "events" || v == "" {
// the 'events' is a radio input, which is buggy below // the 'events' is a radio input, which is buggy below
@ -382,7 +392,6 @@ func testWebhookForms(name string, session *TestSession, validFields map[string]
}) })
} }
} }
}
} }
func assertHasFlashMessages(t *testing.T, resp *httptest.ResponseRecorder, expectedKeys ...string) { func assertHasFlashMessages(t *testing.T, resp *httptest.ResponseRecorder, expectedKeys ...string) {