From 1c49bbeff7310d75160574b0a39d371d485fbf7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=98=99=E2=97=A6=20The=20Tablet=20=E2=9D=80=20GamerGirla?=
 =?UTF-8?q?ndCo=20=E2=97=A6=E2=9D=A7?= <i.am.the.tablet@proton.me>
Date: Mon, 4 May 2026 20:19:41 -0400
Subject: [PATCH] fix: more failing tests

---
 models/issues/issue_xref_test.go |  4 +--
 routers/common/compare_test.go   |  1 +
 services/group/group_test.go     | 42 +++++++++++++++++++++++++++++---
 3 files changed, 41 insertions(+), 6 deletions(-)

diff --git a/models/issues/issue_xref_test.go b/models/issues/issue_xref_test.go
index ba9db3887a..b25a704bec 100644
--- a/models/issues/issue_xref_test.go
+++ b/models/issues/issue_xref_test.go
@@ -54,7 +54,7 @@ func TestXRef_AddCrossReferences(t *testing.T) {
 	itarget = testCreateIssue(t, 3, 3, "title4", "content4", false)
 
 	// Cross-reference to issue #4 by admin
-	content = fmt.Sprintf("content5, mentions org3/group/129/repo3#%d", itarget.Index)
+	content = fmt.Sprintf("content5, mentions org3/repo3#%d", itarget.Index)
 	i = testCreateIssue(t, 2, 1, "title5", content, false)
 	ref = unittest.AssertExistsAndLoadBean(t, &issues_model.Comment{IssueID: itarget.ID, RefIssueID: i.ID, RefCommentID: 0})
 	assert.Equal(t, issues_model.CommentTypeIssueRef, ref.Type)
@@ -63,7 +63,7 @@ func TestXRef_AddCrossReferences(t *testing.T) {
 	assert.Equal(t, references.XRefActionNone, ref.RefAction)
 
 	// Cross-reference to issue #4 with no permission
-	content = fmt.Sprintf("content6, mentions org3/group/129/repo3#%d", itarget.Index)
+	content = fmt.Sprintf("content6, mentions org3/repo3#%d", itarget.Index)
 	i = testCreateIssue(t, 4, 5, "title6", content, false)
 	unittest.AssertNotExistsBean(t, &issues_model.Comment{IssueID: itarget.ID, RefIssueID: i.ID, RefCommentID: 0})
 }
diff --git a/routers/common/compare_test.go b/routers/common/compare_test.go
index e4e24a03cf..7abd725e0f 100644
--- a/routers/common/compare_test.go
+++ b/routers/common/compare_test.go
@@ -65,6 +65,7 @@ func TestCompareRouterReq(t *testing.T) {
 				CompareSeparator: "...",
 				HeadOwner:        "teabot",
 				HeadOriRef:       "feature1",
+				HeadGroupID:      -1,
 			},
 		},
 		{
diff --git a/services/group/group_test.go b/services/group/group_test.go
index a726123e94..cfe5e1723f 100644
--- a/services/group/group_test.go
+++ b/services/group/group_test.go
@@ -6,7 +6,9 @@ package group
 import (
 	"testing"
 
+	"code.gitea.io/gitea/models/db"
 	group_model "code.gitea.io/gitea/models/group"
+	organization_model "code.gitea.io/gitea/models/organization"
 	repo_model "code.gitea.io/gitea/models/repo"
 	"code.gitea.io/gitea/models/unittest"
 	user_model "code.gitea.io/gitea/models/user"
@@ -21,12 +23,43 @@ func TestMain(m *testing.M) {
 	unittest.MainTest(m)
 }
 
+func getOrCreateOrgWithGroups(t *testing.T) *user_model.User {
+	e := db.GetEngine(t.Context())
+	norg := &user_model.User{
+		LowerName: "org-with-groups",
+		FullName:  "Org With Groups",
+		Name:      "Org-With-Groups",
+		Type:      user_model.UserTypeOrganization,
+	}
+
+	hasOrgWithGroups, err := e.Exist(&user_model.User{
+		LowerName: norg.LowerName,
+		Type:      norg.Type,
+	})
+	assert.NoError(t, err)
+	if !hasOrgWithGroups {
+		ownerBean := unittest.AssertExistsAndLoadBean(t, &user_model.User{
+			ID: 2,
+		})
+		assert.NoError(t, organization_model.CreateOrganization(t.Context(), organization_model.OrgFromUser(norg), ownerBean))
+		_, err = e.Table(&group_model.Group{}).Update(&group_model.Group{
+			OwnerName: norg.Name,
+			OwnerID:   norg.ID,
+		})
+		assert.NoError(t, err)
+	}
+	norg = unittest.AssertExistsAndLoadBean(t, norg)
+	return norg
+}
+
 func TestNewGroup(t *testing.T) {
 	assert.NoError(t, unittest.PrepareTestDatabase())
+	orgWithGroups := getOrCreateOrgWithGroups(t)
+
 	const groupName = "group x"
 	group := &group_model.Group{
 		Name:    groupName,
-		OwnerID: 3,
+		OwnerID: orgWithGroups.ID,
 	}
 	assert.NoError(t, NewGroup(t.Context(), group))
 	unittest.AssertExistsAndLoadBean(t, &group_model.Group{Name: groupName})
@@ -34,13 +67,14 @@ func TestNewGroup(t *testing.T) {
 
 func TestMoveGroup(t *testing.T) {
 	assert.NoError(t, unittest.PrepareTestDatabase())
+	orgWithGroups := getOrCreateOrgWithGroups(t)
 	doer := unittest.AssertExistsAndLoadBean(t, &user_model.User{
-		ID: 28,
+		ID: 2,
 	})
 	testfn := func(gid int64) {
 		cond := &group_model.FindGroupsOptions{
 			ParentGroupID: 123,
-			OwnerID:       3,
+			OwnerID:       orgWithGroups.ID,
 		}
 		origCount := unittest.GetCount(t, new(group_model.Group), cond.ToConds())
 
@@ -60,7 +94,7 @@ func TestMoveGroup(t *testing.T) {
 func TestMoveRepo(t *testing.T) {
 	assert.NoError(t, unittest.PrepareTestDatabase())
 	doer := unittest.AssertExistsAndLoadBean(t, &user_model.User{
-		ID: 28,
+		ID: 2,
 	})
 	cond := repo_model.SearchRepositoryCondition(repo_model.SearchRepoOptions{
 		GroupID: 123,