Skip to content

Commit 2a6418a

Browse files
authored
Improve test for TestPullCompare (#30699)
1 parent 6a07501 commit 2a6418a

File tree

1 file changed

+10
-5
lines changed

1 file changed

+10
-5
lines changed

tests/integration/pull_compare_test.go

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,13 @@
44
package integration
55

66
import (
7+
"fmt"
78
"net/http"
89
"net/url"
910
"testing"
1011

1112
"code.gitea.io/gitea/models/db"
13+
issues_model "code.gitea.io/gitea/models/issues"
1214
repo_model "code.gitea.io/gitea/models/repo"
1315
"code.gitea.io/gitea/models/unittest"
1416
user_model "code.gitea.io/gitea/models/user"
@@ -46,22 +48,25 @@ func TestPullCompare(t *testing.T) {
4648
testRepoFork(t, session, "user2", "repo1", "user1", "repo1")
4749
testCreateBranch(t, session, "user1", "repo1", "branch/master", "master1", http.StatusSeeOther)
4850
testEditFile(t, session, "user1", "repo1", "master1", "README.md", "Hello, World (Edited)\n")
49-
resp = testPullCreate(t, session, "user1", "repo1", false, "master", "master1", "This is a pull title")
51+
testPullCreate(t, session, "user1", "repo1", false, "master", "master1", "This is a pull title")
5052

51-
// the max value on issue_index.yml for repo_id=1 is 5
52-
req = NewRequest(t, "GET", "/user2/repo1/pulls/6/files")
53+
repo1 := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{OwnerName: "user2", Name: "repo1"})
54+
issueIndex := unittest.AssertExistsAndLoadBean(t, &issues_model.IssueIndex{GroupID: repo1.ID}, unittest.OrderBy("group_id ASC"))
55+
prFilesURL := fmt.Sprintf("/user2/repo1/pulls/%d/files", issueIndex.MaxIndex)
56+
req = NewRequest(t, "GET", prFilesURL)
5357
resp = session.MakeRequest(t, req, http.StatusOK)
5458
doc := NewHTMLParser(t, resp.Body)
5559
editButtonCount := doc.doc.Find(".diff-file-header-actions a[href*='/_edit/']").Length()
5660
assert.Greater(t, editButtonCount, 0, "Expected to find a button to edit a file in the PR diff view but there were none")
5761

58-
user2 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
5962
repoForked := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{OwnerName: "user1", Name: "repo1"})
63+
user2 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
64+
6065
// delete the head repository and revisit the PR diff view
6166
err := repo_service.DeleteRepositoryDirectly(db.DefaultContext, user2, repoForked.ID)
6267
assert.NoError(t, err)
6368

64-
req = NewRequest(t, "GET", "/user2/repo1/pulls/6/files")
69+
req = NewRequest(t, "GET", prFilesURL)
6570
resp = session.MakeRequest(t, req, http.StatusOK)
6671
doc = NewHTMLParser(t, resp.Body)
6772
editButtonCount = doc.doc.Find(".diff-file-header-actions a[href*='/_edit/']").Length()

0 commit comments

Comments
 (0)