From 17cca5ca21012e2171e0cd3b3145aa2e4b9f0587 Mon Sep 17 00:00:00 2001
From: wxiaoguang <wxiaoguang@gmail.com>
Date: Sat, 25 Apr 2026 14:51:28 +0800
Subject: [PATCH] fix

---
 services/webhook/deliver.go          |  5 +----
 tests/integration/pull_merge_test.go | 19 ++++++++++---------
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/services/webhook/deliver.go b/services/webhook/deliver.go
index 58fba9f68df..105d834b826 100644
--- a/services/webhook/deliver.go
+++ b/services/webhook/deliver.go
@@ -36,10 +36,7 @@ import (
 
 func newDefaultRequest(ctx context.Context, w *webhook_model.Webhook, t *webhook_model.HookTask) (req *http.Request, body []byte, err error) {
 	switch w.HTTPMethod {
-	case "":
-		log.Info("HTTP Method for %s webhook %s [ID: %d] is not set, defaulting to POST", w.Type, w.URL, w.ID)
-		fallthrough
-	case http.MethodPost:
+	case "", http.MethodPost:
 		switch w.ContentType {
 		case webhook_model.ContentTypeJSON:
 			req, err = http.NewRequest(http.MethodPost, w.URL, strings.NewReader(t.PayloadContent))
diff --git a/tests/integration/pull_merge_test.go b/tests/integration/pull_merge_test.go
index 6cadcb59220..3d24c4c3264 100644
--- a/tests/integration/pull_merge_test.go
+++ b/tests/integration/pull_merge_test.go
@@ -96,16 +96,17 @@ func testPullCleanUp(t *testing.T, session *TestSession, user, repo, pullnum str
 func preparePullMergeWebhook(t *testing.T, repoID int64) {
 	require.NoError(t, db.TruncateBeans(t.Context(), &webhook.Webhook{}, &webhook.HookTask{}))
 	require.NoError(t, db.Insert(t.Context(), &webhook.Webhook{
-		RepoID:      1,
-		URL:         "https://www.example.com/url1",
+		RepoID:      repoID,
+		URL:         "http://localhost/gitea-test-webhook-pull-merge",
 		ContentType: webhook.ContentTypeJSON,
 		Events:      `{"push_only":true,"send_everything":false,"choose_events":false,"events":{"create":false,"push":true,"pull_request":false}}`,
 		IsActive:    true,
 	}))
 }
 
-func assertPullMergeWebhookTask(t *testing.T) {
-	unittest.AssertExistsAndLoadBean(t, &webhook.HookTask{HookID: 1})
+func assertPullMergeWebhookTask(t *testing.T, repoID int64) {
+	hook := unittest.AssertExistsAndLoadBean(t, &webhook.Webhook{RepoID: repoID})
+	unittest.AssertExistsAndLoadBean(t, &webhook.HookTask{HookID: hook.ID})
 }
 
 func TestPullMerge(t *testing.T) {
@@ -136,7 +137,7 @@ func TestPullMerge(t *testing.T) {
 		assert.Equal(t, 4, repo.NumPulls)
 		assert.Equal(t, 3, repo.NumOpenPulls)
 
-		assertPullMergeWebhookTask(t)
+		assertPullMergeWebhookTask(t, 1)
 	})
 }
 
@@ -168,7 +169,7 @@ func TestPullRebase(t *testing.T) {
 		assert.Equal(t, 4, repo.NumPulls)
 		assert.Equal(t, 3, repo.NumOpenPulls)
 
-		assertPullMergeWebhookTask(t)
+		assertPullMergeWebhookTask(t, 1)
 	})
 }
 
@@ -200,7 +201,7 @@ func TestPullRebaseMerge(t *testing.T) {
 		assert.Equal(t, 4, repo.NumPulls)
 		assert.Equal(t, 3, repo.NumOpenPulls)
 
-		assertPullMergeWebhookTask(t)
+		assertPullMergeWebhookTask(t, 1)
 	})
 }
 
@@ -221,7 +222,7 @@ func TestPullSquash(t *testing.T) {
 			DeleteBranch: false,
 		})
 
-		assertPullMergeWebhookTask(t)
+		assertPullMergeWebhookTask(t, 1)
 	})
 }
 
@@ -260,7 +261,7 @@ func TestPullSquashWithHeadCommitID(t *testing.T) {
 		assert.Equal(t, 4, repo.NumPulls)
 		assert.Equal(t, 3, repo.NumOpenPulls)
 
-		assertPullMergeWebhookTask(t)
+		assertPullMergeWebhookTask(t, 1)
 	})
 }