|
4 | 4 | package integration |
5 | 5 |
|
6 | 6 | import ( |
| 7 | + "fmt" |
7 | 8 | "net/http" |
8 | 9 | "net/url" |
9 | 10 | "testing" |
10 | 11 |
|
11 | 12 | "code.gitea.io/gitea/models/db" |
| 13 | + issues_model "code.gitea.io/gitea/models/issues" |
12 | 14 | repo_model "code.gitea.io/gitea/models/repo" |
13 | 15 | "code.gitea.io/gitea/models/unittest" |
14 | 16 | user_model "code.gitea.io/gitea/models/user" |
@@ -46,22 +48,25 @@ func TestPullCompare(t *testing.T) { |
46 | 48 | testRepoFork(t, session, "user2", "repo1", "user1", "repo1") |
47 | 49 | testCreateBranch(t, session, "user1", "repo1", "branch/master", "master1", http.StatusSeeOther) |
48 | 50 | 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") |
50 | 52 |
|
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) |
53 | 57 | resp = session.MakeRequest(t, req, http.StatusOK) |
54 | 58 | doc := NewHTMLParser(t, resp.Body) |
55 | 59 | editButtonCount := doc.doc.Find(".diff-file-header-actions a[href*='/_edit/']").Length() |
56 | 60 | assert.Greater(t, editButtonCount, 0, "Expected to find a button to edit a file in the PR diff view but there were none") |
57 | 61 |
|
58 | | - user2 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}) |
59 | 62 | repoForked := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{OwnerName: "user1", Name: "repo1"}) |
| 63 | + user2 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}) |
| 64 | + |
60 | 65 | // delete the head repository and revisit the PR diff view |
61 | 66 | err := repo_service.DeleteRepositoryDirectly(db.DefaultContext, user2, repoForked.ID) |
62 | 67 | assert.NoError(t, err) |
63 | 68 |
|
64 | | - req = NewRequest(t, "GET", "/user2/repo1/pulls/6/files") |
| 69 | + req = NewRequest(t, "GET", prFilesURL) |
65 | 70 | resp = session.MakeRequest(t, req, http.StatusOK) |
66 | 71 | doc = NewHTMLParser(t, resp.Body) |
67 | 72 | editButtonCount = doc.doc.Find(".diff-file-header-actions a[href*='/_edit/']").Length() |
|
0 commit comments