Fix test

Author: lunny

tests/integration/issue_test.go

@@ -26,7 +26,6 @@ import (
 	api "code.gitea.io/gitea/modules/structs"
 	"code.gitea.io/gitea/modules/test"
 	"code.gitea.io/gitea/tests"
-	"xorm.io/builder"
 
 	"github.com/PuerkitoBio/goquery"
 	"github.com/stretchr/testify/assert"
@@ -477,49 +476,42 @@ func TestIssueRedirect(t *testing.T) {
 	session := loginUser(t, "user2")
 
 	// Test external tracker where style not set (shall default numeric)
-	req := NewRequest(t, "GET", path.Join("org26", "repo_external_tracker", "issues", "1"))
+	req := NewRequest(t, "GET", "/org26/repo_external_tracker/issues/1")
 	resp := session.MakeRequest(t, req, http.StatusSeeOther)
 	assert.Equal(t, "https://tracker.com/org26/repo_external_tracker/issues/1", test.RedirectURL(resp))
 
 	// Test external tracker with numeric style
-	req = NewRequest(t, "GET", path.Join("org26", "repo_external_tracker_numeric", "issues", "1"))
+	req = NewRequest(t, "GET", "/org26/repo_external_tracker_numeric/issues/1")
 	resp = session.MakeRequest(t, req, http.StatusSeeOther)
 	assert.Equal(t, "https://tracker.com/org26/repo_external_tracker_numeric/issues/1", test.RedirectURL(resp))
 
 	// Test external tracker with alphanumeric style (for a pull request)
-	req = NewRequest(t, "GET", path.Join("org26", "repo_external_tracker_alpha", "issues", "1"))
+	req = NewRequest(t, "GET", "/org26/repo_external_tracker_alpha/issues/1")
 	resp = session.MakeRequest(t, req, http.StatusSeeOther)
-	assert.Equal(t, "/"+path.Join("org26", "repo_external_tracker_alpha", "pulls", "1"), test.RedirectURL(resp))
+	assert.Equal(t, "/org26/repo_external_tracker_alpha/pulls/1", test.RedirectURL(resp))
 
 	// test to check that the PR redirection works if the issue unit is disabled
 	// repo1 is a normal repository with issue unit enabled, visit issue 2(which is a pull request)
 	// will redirect to pulls
-	req = NewRequest(t, "GET", path.Join("user2", "repo1", "issues", "2"))
+	req = NewRequest(t, "GET", "/user2/repo1/issues/2")
 	resp = session.MakeRequest(t, req, http.StatusSeeOther)
-	assert.Equal(t, "/"+path.Join("user2", "repo1", "pulls", "2"), test.RedirectURL(resp))
+	assert.Equal(t, "/user2/repo1/pulls/2", test.RedirectURL(resp))
 
 	// disable issue unit
-	repoUnit, exist, err := db.Get[repo_model.RepoUnit](t.Context(), builder.Eq{
-		"repo_id": 1,
-		"type":    unit.TypeIssues,
-	})
-	assert.NoError(t, err)
-	assert.True(t, exist)
-	assert.NotNil(t, repoUnit)
+	repoUnit := unittest.AssertExistsAndLoadBean(t, &repo_model.RepoUnit{RepoID: 1, Type: unit.TypeIssues})
 
-	_, err = db.DeleteByID[repo_model.RepoUnit](t.Context(), repoUnit.ID)
+	_, err := db.DeleteByID[repo_model.RepoUnit](t.Context(), repoUnit.ID)
 	assert.NoError(t, err)
 
-	defer func() {
-		repoUnit.ID = 0
-		assert.NoError(t, db.Insert(t.Context(), repoUnit))
-	}()
-
 	// even if the issue unit is disabled, visiting an issue which is a pull request
 	// will still redirect to pull request
-	req = NewRequest(t, "GET", path.Join("user2", "repo1", "issues", "2"))
+	req = NewRequest(t, "GET", "/user2/repo1/issues/2")
 	resp = session.MakeRequest(t, req, http.StatusSeeOther)
-	assert.Equal(t, "/"+path.Join("user2", "repo1", "pulls", "2"), test.RedirectURL(resp))
+	assert.Equal(t, "/user2/repo1/pulls/2", test.RedirectURL(resp))
+
+	// cleanup, re-enable issue unit
+	repoUnit.ID = 0
+	assert.NoError(t, db.Insert(t.Context(), repoUnit))
 }
 
 func TestSearchIssues(t *testing.T) {