Add test

Author: hiifong

tests/integration/pull_merge_test.go

@@ -40,6 +40,7 @@ import (
 	repo_service "code.gitea.io/gitea/services/repository"
 	commitstatus_service "code.gitea.io/gitea/services/repository/commitstatus"
 	files_service "code.gitea.io/gitea/services/repository/files"
+	"github.com/stretchr/testify/require"
 
 	"github.com/stretchr/testify/assert"
 )
@@ -168,10 +169,104 @@ func TestPullSquash(t *testing.T) {
 
 		resp := testPullCreate(t, session, "user1", "repo1", false, "master", "master", "This is a pull title")
 
-		elem := strings.Split(test.RedirectURL(resp), "/")
+		prURL := test.RedirectURL(resp)
+		elem := strings.Split(prURL, "/")
 		assert.Equal(t, "pulls", elem[3])
+
+		resp = session.MakeRequest(t, NewRequest(t, "GET", prURL), http.StatusOK)
+		htmlDoc := NewHTMLParser(t, resp.Body)
+		dataURL, exists := htmlDoc.doc.Find("#allow-edits-from-maintainers").Attr("data-url")
+		assert.True(t, exists)
+		req := NewRequestWithValues(t, "POST", dataURL+"/set_allow_maintainer_edit", map[string]string{
+			"_csrf":                 htmlDoc.GetCSRF(),
+			"allow_maintainer_edit": "true",
+		})
+		session.MakeRequest(t, req, http.StatusOK)
+
+		user2Session := loginUser(t, "user2")
+		resp = user2Session.MakeRequest(t, NewRequest(t, "GET", prURL+"/files"), http.StatusOK)
+		htmlDoc = NewHTMLParser(t, resp.Body)
+		nodes := htmlDoc.doc.Find(".diff-file-box[data-new-filename=\"README.md\"] .diff-file-header-actions .tippy-target a")
+		if assert.Equal(t, 2, nodes.Length()) {
+			assert.Equal(t, "Edit File", nodes.Last().Text())
+			editFileLink, exists := nodes.Last().Attr("href")
+			if assert.True(t, exists) {
+				// edit the file
+				resp := user2Session.MakeRequest(t, NewRequest(t, "GET", editFileLink), http.StatusOK)
+				htmlDoc := NewHTMLParser(t, resp.Body)
+				lastCommit := htmlDoc.GetInputValueByName("last_commit")
+				assert.NotEmpty(t, lastCommit)
+				req := NewRequestWithValues(t, "POST", editFileLink, map[string]string{
+					"_csrf":          htmlDoc.GetCSRF(),
+					"last_commit":    lastCommit,
+					"tree_path":      "README.md",
+					"content":        "Hello, World (Edite!!)",
+					"commit_summary": "user2 updated the file",
+					"commit_choice":  "direct",
+				})
+				resp = user2Session.MakeRequest(t, req, http.StatusOK)
+				assert.NotEmpty(t, test.RedirectURL(resp))
+			}
+		}
+		resp = user2Session.MakeRequest(t, NewRequest(t, "GET", prURL+"/files"), http.StatusOK)
+		htmlDoc = NewHTMLParser(t, resp.Body)
+		nodes = htmlDoc.doc.Find(".diff-file-box[data-new-filename=\"README.md\"] .diff-file-header-actions .tippy-target a")
+		if assert.Equal(t, 2, nodes.Length()) {
+			assert.Equal(t, "Edit File", nodes.Last().Text())
+			editFileLink, exists := nodes.Last().Attr("href")
+			if assert.True(t, exists) {
+				// edit the file
+				resp := user2Session.MakeRequest(t, NewRequest(t, "GET", editFileLink), http.StatusOK)
+				htmlDoc := NewHTMLParser(t, resp.Body)
+				lastCommit := htmlDoc.GetInputValueByName("last_commit")
+				assert.NotEmpty(t, lastCommit)
+				req := NewRequestWithValues(t, "POST", editFileLink, map[string]string{
+					"_csrf":          htmlDoc.GetCSRF(),
+					"last_commit":    lastCommit,
+					"tree_path":      "README.md",
+					"content":        "Hello, World (Edite!!!)",
+					"commit_summary": "user2 updated the file!",
+					"commit_choice":  "direct",
+				})
+				resp = user2Session.MakeRequest(t, req, http.StatusOK)
+				assert.NotEmpty(t, test.RedirectURL(resp))
+			}
+		}
+
 		testPullMerge(t, session, elem[1], elem[2], elem[4], repo_model.MergeStyleSquash, false)
 
+		req = NewRequest(t, "GET", "/user2/repo1/src/branch/master/")
+		resp = user2Session.MakeRequest(t, req, http.StatusOK)
+		htmlDoc = NewHTMLParser(t, resp.Body)
+		commitHref := htmlDoc.doc.Find(".latest-commit .commit-id-short").AttrOr("href", "")
+		assert.NotEmpty(t, commitHref)
+
+		req = NewRequest(t, "GET", commitHref)
+		resp = user2Session.MakeRequest(t, req, http.StatusOK)
+		htmlDoc = NewHTMLParser(t, resp.Body)
+		prTitle, exists := htmlDoc.doc.Find(".commit-summary").Attr("title")
+		assert.True(t, exists)
+		assert.Contains(t, prTitle, "This is a pull title")
+
+		commitBody := htmlDoc.doc.Find(".commit-body").Text()
+		assert.NotEmpty(t, commitBody)
+		assert.Contains(t, commitBody, "--------------------")
+
+		req = NewRequest(t, "GET", fmt.Sprintf("/user2/repo1/pulls/%s/commits/list", elem[4]))
+		resp = user2Session.MakeRequest(t, req, http.StatusOK)
+
+		var pullCommitList struct {
+			Commits             []pull_service.CommitInfo `json:"commits"`
+			LastReviewCommitSha string                    `json:"last_review_commit_sha"`
+		}
+		DecodeJSON(t, resp, &pullCommitList)
+
+		require.Len(t, pullCommitList.Commits, 4)
+
+		for _, commit := range pullCommitList.Commits {
+			assert.Contains(t, commitBody, fmt.Sprintf("* %s", commit.Summary))
+		}
+
 		hookTasks, err = webhook.HookTasks(db.DefaultContext, 1, 1)
 		assert.NoError(t, err)
 		assert.Len(t, hookTasks, hookTasksLenBefore+1)