Fix review submission from single-commit PR view

templates/repo/diff/new_review.tmpl

@@ -11,7 +11,7 @@
 {{if $.IsShowingAllCommits}}
 <div class="review-box-panel tippy-target">
 	<div class="ui segment">
-		<form class="ui form form-fetch-action" action="{{.Link}}/reviews/submit" method="post">
+		<form class="ui form form-fetch-action" action="{{.Issue.Link}}/files/reviews/submit" method="post">
 			<input type="hidden" name="commit_id" value="{{.AfterCommitID}}">
 			<div class="field flex-text-block">
 				<div class="tw-flex-1">{{ctx.Locale.Tr "repo.diff.review.header"}}</div>

tests/integration/pull_diff_test.go

@@ -13,21 +13,34 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
-func TestPullDiff_CompletePRDiff(t *testing.T) {
-	doTestPRDiff(t, "/user2/commitsonpr/pulls/1/files", false, []string{"test1.txt", "test10.txt", "test2.txt", "test3.txt", "test4.txt", "test5.txt", "test6.txt", "test7.txt", "test8.txt", "test9.txt"})
+func TestPullDiff(t *testing.T) {
+	defer tests.PrepareTestEnv(t)()
+	t.Run("CompletePRDiff", func(t *testing.T) {
+		testPullDiffAssertPage(t, "/user2/commitsonpr/pulls/1/files", false, []string{"test1.txt", "test10.txt", "test2.txt", "test3.txt", "test4.txt", "test5.txt", "test6.txt", "test7.txt", "test8.txt", "test9.txt"})
+	})
+	t.Run("SingleCommitPRDiff", func(t *testing.T) {
+		testPullDiffAssertPage(t, "/user2/commitsonpr/pulls/1/commits/c5626fc9eff57eb1bb7b796b01d4d0f2f3f792a2", true, []string{"test3.txt"})
+	})
+	t.Run("CommitRangePRDiff", func(t *testing.T) {
+		testPullDiffAssertPage(t, "/user2/commitsonpr/pulls/1/files/4ca8bcaf27e28504df7bf996819665986b01c847..23576dd018294e476c06e569b6b0f170d0558705", true, []string{"test2.txt", "test3.txt", "test4.txt"})
+	})
+	t.Run("SingleHeadCommitReviewFormAction", testPullDiffSingleHeadCommitReviewFormAction)
 }
 
-func TestPullDiff_SingleCommitPRDiff(t *testing.T) {
-	doTestPRDiff(t, "/user2/commitsonpr/pulls/1/commits/c5626fc9eff57eb1bb7b796b01d4d0f2f3f792a2", true, []string{"test3.txt"})
-}
+func testPullDiffSingleHeadCommitReviewFormAction(t *testing.T) {
+	session := loginUser(t, "user2")
+	req := NewRequest(t, "GET", "/user2/commitsonpr/pulls/1/commits/1978192d98bb1b65e11c2cf37da854fbf94bffd6")
+	resp := session.MakeRequest(t, req, http.StatusOK)
+	doc := NewHTMLParser(t, resp.Body)
 
-func TestPullDiff_CommitRangePRDiff(t *testing.T) {
-	doTestPRDiff(t, "/user2/commitsonpr/pulls/1/files/4ca8bcaf27e28504df7bf996819665986b01c847..23576dd018294e476c06e569b6b0f170d0558705", true, []string{"test2.txt", "test3.txt", "test4.txt"})
+	btn := doc.Find(".js-btn-review")
+	assert.True(t, btn.Length() == 1 && !btn.HasClass("disabled"))
+	form := doc.Find(".review-box-panel form")
+	assert.Equal(t, 1, form.Length())
+	assert.Equal(t, "/user2/commitsonpr/pulls/1/files/reviews/submit", form.AttrOr("action", ""))
 }
 
-func doTestPRDiff(t *testing.T, prDiffURL string, reviewBtnDisabled bool, expectedFilenames []string) {
-	defer tests.PrepareTestEnv(t)()
-
+func testPullDiffAssertPage(t *testing.T, prDiffURL string, reviewBtnDisabled bool, expectedFilenames []string) {
 	session := loginUser(t, "user2")
 
 	req := NewRequest(t, "GET", "/user2/commitsonpr/pulls")
@@ -39,7 +52,7 @@ func doTestPRDiff(t *testing.T, prDiffURL string, reviewBtnDisabled bool, expect
 	doc := NewHTMLParser(t, resp.Body)
 
 	// Assert all files are visible.
-	fileContents := doc.doc.Find(".file-content")
+	fileContents := doc.Find(".file-content")
 	numberOfFiles := fileContents.Length()
 
 	assert.Equal(t, len(expectedFilenames), numberOfFiles)
@@ -50,5 +63,5 @@ func doTestPRDiff(t *testing.T, prDiffURL string, reviewBtnDisabled bool, expect
 	})
 
 	// Ensure the review button is enabled for full PR reviews
-	assert.Equal(t, reviewBtnDisabled, doc.doc.Find(".js-btn-review").HasClass("disabled"))
+	assert.Equal(t, reviewBtnDisabled, doc.Find(".js-btn-review").HasClass("disabled"))
 }