Improve test for TestPullCompare (#30699)

diff --git a/tests/integration/pull_compare_test.go b/tests/integration/pull_compare_test.go
index b814207b2fe22a4ec7b7d1a6b24560db7c57cfad..39d9103dfd9f7aa5bb9c4fe7e06eccafbf5f71eb 100644 (file)
--- a/tests/integration/pull_compare_test.go
+++ b/tests/integration/pull_compare_test.go
@@ -4,11 +4,13 @@
 package integration
 
 import (
+       "fmt"
        "net/http"
        "net/url"
        "testing"
 
        "code.gitea.io/gitea/models/db"
+       issues_model "code.gitea.io/gitea/models/issues"
        repo_model "code.gitea.io/gitea/models/repo"
        "code.gitea.io/gitea/models/unittest"
        user_model "code.gitea.io/gitea/models/user"
@@ -46,22 +48,25 @@ func TestPullCompare(t *testing.T) {
                testRepoFork(t, session, "user2", "repo1", "user1", "repo1")
                testCreateBranch(t, session, "user1", "repo1", "branch/master", "master1", http.StatusSeeOther)
                testEditFile(t, session, "user1", "repo1", "master1", "README.md", "Hello, World (Edited)\n")
-               resp = testPullCreate(t, session, "user1", "repo1", false, "master", "master1", "This is a pull title")
+               testPullCreate(t, session, "user1", "repo1", false, "master", "master1", "This is a pull title")
 
-               // the max value on issue_index.yml for repo_id=1 is 5
-               req = NewRequest(t, "GET", "/user2/repo1/pulls/6/files")
+               repo1 := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{OwnerName: "user2", Name: "repo1"})
+               issueIndex := unittest.AssertExistsAndLoadBean(t, &issues_model.IssueIndex{GroupID: repo1.ID}, unittest.OrderBy("group_id ASC"))
+               prFilesURL := fmt.Sprintf("/user2/repo1/pulls/%d/files", issueIndex.MaxIndex)
+               req = NewRequest(t, "GET", prFilesURL)
                resp = session.MakeRequest(t, req, http.StatusOK)
                doc := NewHTMLParser(t, resp.Body)
                editButtonCount := doc.doc.Find(".diff-file-header-actions a[href*='/_edit/']").Length()
                assert.Greater(t, editButtonCount, 0, "Expected to find a button to edit a file in the PR diff view but there were none")
 
-               user2 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
                repoForked := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{OwnerName: "user1", Name: "repo1"})
+               user2 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
+
                // delete the head repository and revisit the PR diff view
                err := repo_service.DeleteRepositoryDirectly(db.DefaultContext, user2, repoForked.ID)
                assert.NoError(t, err)
 
-               req = NewRequest(t, "GET", "/user2/repo1/pulls/6/files")
+               req = NewRequest(t, "GET", prFilesURL)
                resp = session.MakeRequest(t, req, http.StatusOK)
                doc = NewHTMLParser(t, resp.Body)
                editButtonCount = doc.doc.Find(".diff-file-header-actions a[href*='/_edit/']").Length()