Consolidate boilerplate in integration tests (#1979)

1 files changed, 15 insertions, 21 deletions

diff --git a/integrations/change_default_branch_test.go b/integrations/change_default_branch_test.go
index 03ece46a58..d34cd176cd 100644
--- a/integrations/change_default_branch_test.go
+++ b/integrations/change_default_branch_test.go
@@ -5,10 +5,8 @@
 package integrations
 
 import (
-	"bytes"
 	"fmt"
 	"net/http"
-	"net/url"
 	"testing"
 
 	"code.gitea.io/gitea/models"
@@ -21,21 +19,19 @@ func TestChangeDefaultBranch(t *testing.T) {
 	repo := models.AssertExistsAndLoadBean(t, &models.Repository{ID: 1}).(*models.Repository)
 	owner := models.AssertExistsAndLoadBean(t, &models.User{ID: repo.OwnerID}).(*models.User)
 
-	session := loginUser(t, owner.Name, "password")
+	session := loginUser(t, owner.Name)
 	branchesURL := fmt.Sprintf("/%s/%s/settings/branches", owner.Name, repo.Name)
 
 	req := NewRequest(t, "GET", branchesURL)
 	resp := session.MakeRequest(t, req)
 	assert.EqualValues(t, http.StatusOK, resp.HeaderCode)
-	doc, err := NewHtmlParser(resp.Body)
-	assert.NoError(t, err)
-
-	req = NewRequestBody(t, "POST", branchesURL,
-		bytes.NewBufferString(url.Values{
-			"_csrf":  []string{doc.GetInputValueByName("_csrf")},
-			"action": []string{"default_branch"},
-			"branch": []string{"DefaultBranch"},
-		}.Encode()))
+	doc := NewHtmlParser(t, resp.Body)
+
+	req = NewRequestWithValues(t, "POST", branchesURL, map[string]string{
+		"_csrf":  doc.GetCSRF(),
+		"action": "default_branch",
+		"branch": "DefaultBranch",
+	})
 	req.Header.Add("Content-Type", "application/x-www-form-urlencoded")
 	resp = session.MakeRequest(t, req)
 	assert.EqualValues(t, http.StatusFound, resp.HeaderCode)
@@ -43,15 +39,13 @@ func TestChangeDefaultBranch(t *testing.T) {
 	req = NewRequest(t, "GET", branchesURL)
 	resp = session.MakeRequest(t, req)
 	assert.EqualValues(t, http.StatusOK, resp.HeaderCode)
-	doc, err = NewHtmlParser(resp.Body)
-	assert.NoError(t, err)
-
-	req = NewRequestBody(t, "POST", branchesURL,
-		bytes.NewBufferString(url.Values{
-			"_csrf":  []string{doc.GetInputValueByName("_csrf")},
-			"action": []string{"default_branch"},
-			"branch": []string{"does_not_exist"},
-		}.Encode()))
+	doc = NewHtmlParser(t, resp.Body)
+
+	req = NewRequestWithValues(t, "POST", branchesURL, map[string]string{
+		"_csrf":  doc.GetInputValueByName("_csrf"),
+		"action": "default_branch",
+		"branch": "does_not_exist",
+	})
 	req.Header.Add("Content-Type", "application/x-www-form-urlencoded")
 	resp = session.MakeRequest(t, req)
 	assert.EqualValues(t, http.StatusNotFound, resp.HeaderCode)