Display URLs in integration test logs (#1924)

diff --git a/integrations/api_repo_test.go b/integrations/api_repo_test.go
index 64649efe1d138f4c929b29794cdce7e55cf6e237..e4f907cc91566819e1186df6dccfb4794cb31704 100644 (file)
--- a/integrations/api_repo_test.go
+++ b/integrations/api_repo_test.go
@@ -16,8 +16,7 @@ import (
 func TestAPIUserReposNotLogin(t *testing.T) {
        assert.NoError(t, models.LoadFixtures())
 
-       req, err := http.NewRequest("GET", "/api/v1/users/user2/repos", nil)
-       assert.NoError(t, err)
+       req := NewRequest(t, "GET", "/api/v1/users/user2/repos")
        resp := MakeRequest(req)
        assert.EqualValues(t, http.StatusOK, resp.HeaderCode)
 }
@@ -25,8 +24,7 @@ func TestAPIUserReposNotLogin(t *testing.T) {
 func TestAPISearchRepoNotLogin(t *testing.T) {
        assert.NoError(t, models.LoadFixtures())
 
-       req, err := http.NewRequest("GET", "/api/v1/repos/search?q=Test", nil)
-       assert.NoError(t, err)
+       req := NewRequest(t, "GET", "/api/v1/repos/search?q=Test")
        resp := MakeRequest(req)
        assert.EqualValues(t, http.StatusOK, resp.HeaderCode)
 }

diff --git a/integrations/api_team_test.go b/integrations/api_team_test.go
index 543e1579cdcd2c8c1e3dd2963004d52ba734c246..69198cd7eb30a08ecce5dd8909f839a03eec7160 100644 (file)
--- a/integrations/api_team_test.go
+++ b/integrations/api_team_test.go
@@ -25,8 +25,7 @@ func TestAPITeam(t *testing.T) {
 
        session := loginUser(t, user.Name, "password")
        url := fmt.Sprintf("/api/v1/teams/%d", teamUser.TeamID)
-       req, err := http.NewRequest("GET", url, nil)
-       assert.NoError(t, err)
+       req := NewRequest(t, "GET", url)
        resp := session.MakeRequest(t, req)
        assert.EqualValues(t, http.StatusOK, resp.HeaderCode)
 

diff --git a/integrations/delete_user_test.go b/integrations/delete_user_test.go
index bf38eeae2b156dd476e1a85013cb41bac26b3f83..2040830f2ecdb753136fa94ab3bae8d83b2bf853 100644 (file)
--- a/integrations/delete_user_test.go
+++ b/integrations/delete_user_test.go
@@ -20,18 +20,16 @@ func TestDeleteUser(t *testing.T) {
 
        session := loginUser(t, "user1", "password")
 
-       req, err := http.NewRequest("GET", "/admin/users/8", nil)
-       assert.NoError(t, err)
+       req := NewRequest(t, "GET", "/admin/users/8")
        resp := session.MakeRequest(t, req)
        assert.EqualValues(t, http.StatusOK, resp.HeaderCode)
 
        doc, err := NewHtmlParser(resp.Body)
        assert.NoError(t, err)
-       req, err = http.NewRequest("POST", "/admin/users/8/delete",
+       req = NewRequestBody(t, "POST", "/admin/users/8/delete",
                bytes.NewBufferString(url.Values{
                        "_csrf": []string{doc.GetInputValueByName("_csrf")},
                }.Encode()))
-       assert.NoError(t, err)
        req.Header.Add("Content-Type", "application/x-www-form-urlencoded")
        resp = session.MakeRequest(t, req)
        assert.EqualValues(t, http.StatusOK, resp.HeaderCode)

diff --git a/integrations/editor_test.go b/integrations/editor_test.go
index 976def89eb98f684b56adced65840929f3e11ad5..64212d3f29671242e64ceab6c992fcad28bf97b5 100644 (file)
--- a/integrations/editor_test.go
+++ b/integrations/editor_test.go
@@ -20,8 +20,7 @@ func TestCreateFile(t *testing.T) {
        session := loginUser(t, "user2", "password")
 
        // Request editor page
-       req, err := http.NewRequest("GET", "/user2/repo1/_new/master/", nil)
-       assert.NoError(t, err)
+       req := NewRequest(t, "GET", "/user2/repo1/_new/master/")
        resp := session.MakeRequest(t, req)
        assert.EqualValues(t, http.StatusOK, resp.HeaderCode)
 
@@ -31,7 +30,7 @@ func TestCreateFile(t *testing.T) {
        assert.NotEmpty(t, lastCommit)
 
        // Save new file to master branch
-       req, err = http.NewRequest("POST", "/user2/repo1/_new/master/",
+       req = NewRequestBody(t, "POST", "/user2/repo1/_new/master/",
                bytes.NewBufferString(url.Values{
                        "_csrf":         []string{doc.GetInputValueByName("_csrf")},
                        "last_commit":   []string{lastCommit},
@@ -40,7 +39,6 @@ func TestCreateFile(t *testing.T) {
                        "commit_choice": []string{"direct"},
                }.Encode()),
        )
-       assert.NoError(t, err)
        req.Header.Add("Content-Type", "application/x-www-form-urlencoded")
        resp = session.MakeRequest(t, req)
        assert.EqualValues(t, http.StatusFound, resp.HeaderCode)
@@ -52,8 +50,7 @@ func TestCreateFileOnProtectedBranch(t *testing.T) {
        session := loginUser(t, "user2", "password")
 
        // Open repository branch settings
-       req, err := http.NewRequest("GET", "/user2/repo1/settings/branches", nil)
-       assert.NoError(t, err)
+       req := NewRequest(t, "GET", "/user2/repo1/settings/branches")
        resp := session.MakeRequest(t, req)
        assert.EqualValues(t, http.StatusOK, resp.HeaderCode)
 
@@ -61,7 +58,7 @@ func TestCreateFileOnProtectedBranch(t *testing.T) {
        assert.NoError(t, err)
 
        // Change master branch to protected
-       req, err = http.NewRequest("POST", "/user2/repo1/settings/branches?action=protected_branch",
+       req = NewRequestBody(t, "POST", "/user2/repo1/settings/branches?action=protected_branch",
                bytes.NewBufferString(url.Values{
                        "_csrf":      []string{doc.GetInputValueByName("_csrf")},
                        "branchName": []string{"master"},
@@ -78,8 +75,7 @@ func TestCreateFileOnProtectedBranch(t *testing.T) {
        assert.EqualValues(t, flashCookie.Value, "success%3Dmaster%2BLocked%2Bsuccessfully")
 
        // Request editor page
-       req, err = http.NewRequest("GET", "/user2/repo1/_new/master/", nil)
-       assert.NoError(t, err)
+       req = NewRequest(t, "GET", "/user2/repo1/_new/master/")
        resp = session.MakeRequest(t, req)
        assert.EqualValues(t, http.StatusOK, resp.HeaderCode)
 
@@ -89,7 +85,7 @@ func TestCreateFileOnProtectedBranch(t *testing.T) {
        assert.NotEmpty(t, lastCommit)
 
        // Save new file to master branch
-       req, err = http.NewRequest("POST", "/user2/repo1/_new/master/",
+       req = NewRequestBody(t, "POST", "/user2/repo1/_new/master/",
                bytes.NewBufferString(url.Values{
                        "_csrf":         []string{doc.GetInputValueByName("_csrf")},
                        "last_commit":   []string{lastCommit},
@@ -98,7 +94,6 @@ func TestCreateFileOnProtectedBranch(t *testing.T) {
                        "commit_choice": []string{"direct"},
                }.Encode()),
        )
-       assert.NoError(t, err)
        req.Header.Add("Content-Type", "application/x-www-form-urlencoded")
        resp = session.MakeRequest(t, req)
        assert.EqualValues(t, http.StatusOK, resp.HeaderCode)
@@ -111,8 +106,7 @@ func testEditFile(t *testing.T, session *TestSession, user, repo, branch, filePa
        newContent := "Hello, World (Edited)\n"
 
        // Get to the 'edit this file' page
-       req, err := http.NewRequest("GET", path.Join(user, repo, "_edit", branch, filePath), nil)
-       assert.NoError(t, err)
+       req := NewRequest(t, "GET", path.Join(user, repo, "_edit", branch, filePath))
        resp := session.MakeRequest(t, req)
        assert.EqualValues(t, http.StatusOK, resp.HeaderCode)
 
@@ -122,7 +116,7 @@ func testEditFile(t *testing.T, session *TestSession, user, repo, branch, filePa
        assert.NotEmpty(t, lastCommit)
 
        // Submit the edits
-       req, err = http.NewRequest("POST", path.Join(user, repo, "_edit", branch, filePath),
+       req = NewRequestBody(t, "POST", path.Join(user, repo, "_edit", branch, filePath),
                bytes.NewBufferString(url.Values{
                        "_csrf":         []string{htmlDoc.GetInputValueByName("_csrf")},
                        "last_commit":   []string{lastCommit},
@@ -131,14 +125,12 @@ func testEditFile(t *testing.T, session *TestSession, user, repo, branch, filePa
                        "commit_choice": []string{"direct"},
                }.Encode()),
        )
-       assert.NoError(t, err)
        req.Header.Add("Content-Type", "application/x-www-form-urlencoded")
        resp = session.MakeRequest(t, req)
        assert.EqualValues(t, http.StatusFound, resp.HeaderCode)
 
        // Verify the change
-       req, err = http.NewRequest("GET", path.Join(user, repo, "raw", branch, filePath), nil)
-       assert.NoError(t, err)
+       req = NewRequest(t, "GET", path.Join(user, repo, "raw", branch, filePath))
        resp = session.MakeRequest(t, req)
        assert.EqualValues(t, http.StatusOK, resp.HeaderCode)
        assert.EqualValues(t, newContent, string(resp.Body))

diff --git a/integrations/integration_test.go b/integrations/integration_test.go
index 88b4614b7621b63799967cbc3b50233447dfd90c..1cc1eb049f2fa2d27584f90e3bc7f59761e9ed2f 100644 (file)
--- a/integrations/integration_test.go
+++ b/integrations/integration_test.go
@@ -147,22 +147,20 @@ func (s *TestSession) MakeRequest(t *testing.T, req *http.Request) *TestResponse
 }
 
 func loginUser(t *testing.T, userName, password string) *TestSession {
-       req, err := http.NewRequest("GET", "/user/login", nil)
-       assert.NoError(t, err)
+       req := NewRequest(t, "GET", "/user/login")
        resp := MakeRequest(req)
        assert.EqualValues(t, http.StatusOK, resp.HeaderCode)
 
        doc, err := NewHtmlParser(resp.Body)
        assert.NoError(t, err)
 
-       req, err = http.NewRequest("POST", "/user/login",
+       req = NewRequestBody(t, "POST", "/user/login",
                bytes.NewBufferString(url.Values{
                        "_csrf":     []string{doc.GetInputValueByName("_csrf")},
                        "user_name": []string{userName},
                        "password":  []string{password},
                }.Encode()),
        )
-       assert.NoError(t, err)
        req.Header.Add("Content-Type", "application/x-www-form-urlencoded")
        resp = MakeRequest(req)
        assert.EqualValues(t, http.StatusFound, resp.HeaderCode)
@@ -204,6 +202,17 @@ type TestResponse struct {
        Headers    http.Header
 }
 
+func NewRequest(t *testing.T, method, url string) *http.Request {
+       return NewRequestBody(t, method, url, nil)
+}
+
+func NewRequestBody(t *testing.T, method, url string, body io.Reader) *http.Request {
+       request, err := http.NewRequest(method, url, body)
+       assert.NoError(t, err)
+       request.RequestURI = url
+       return request
+}
+
 func MakeRequest(req *http.Request) *TestResponse {
        buffer := bytes.NewBuffer(nil)
        respWriter := &TestResponseWriter{

diff --git a/integrations/internal_test.go b/integrations/internal_test.go
index 12d6fc8dc92d5b15333278e3e33e8aedbfbc9944..3af079dc8137a45c51011964420b8c7ce8f8306d 100644 (file)
--- a/integrations/internal_test.go
+++ b/integrations/internal_test.go
@@ -19,11 +19,10 @@ import (
 
 func assertProtectedBranch(t *testing.T, repoID int64, branchName string, isErr, canPush bool) {
        reqURL := fmt.Sprintf("/api/internal/branch/%d/%s", repoID, url.QueryEscape(branchName))
-       req, err := http.NewRequest("GET", reqURL, nil)
+       req := NewRequest(t, "GET", reqURL)
        t.Log(reqURL)
        req.Header.Add("Authorization", fmt.Sprintf("Bearer %s", setting.InternalToken))
 
-       assert.NoError(t, err)
        resp := MakeRequest(req)
        if isErr {
                assert.EqualValues(t, 500, resp.HeaderCode)

diff --git a/integrations/issue_test.go b/integrations/issue_test.go
index 51fcc96f8c65c68086709843d329457cec4d9750..3b486dc505d164a421cf246ed8f17231361d8ffe 100644 (file)
--- a/integrations/issue_test.go
+++ b/integrations/issue_test.go
@@ -14,8 +14,7 @@ import (
 func TestNoLoginViewIssues(t *testing.T) {
        prepareTestEnv(t)
 
-       req, err := http.NewRequest("GET", "/user2/repo1/issues", nil)
-       assert.NoError(t, err)
+       req := NewRequest(t, "GET", "/user2/repo1/issues")
        resp := MakeRequest(req)
        assert.EqualValues(t, http.StatusOK, resp.HeaderCode)
 }
@@ -23,8 +22,7 @@ func TestNoLoginViewIssues(t *testing.T) {
 func TestNoLoginViewIssue(t *testing.T) {
        prepareTestEnv(t)
 
-       req, err := http.NewRequest("GET", "/user2/repo1/issues/1", nil)
-       assert.NoError(t, err)
+       req := NewRequest(t, "GET", "/user2/repo1/issues/1")
        resp := MakeRequest(req)
        assert.EqualValues(t, http.StatusOK, resp.HeaderCode)
 }

diff --git a/integrations/pull_compare_test.go b/integrations/pull_compare_test.go
index 567a1d13f707c1b699544d7e93a70bee585d18d0..737d5ab823660cdc16bde8073f1aeb374effda53 100644 (file)
--- a/integrations/pull_compare_test.go
+++ b/integrations/pull_compare_test.go
@@ -15,8 +15,7 @@ func TestPullCompare(t *testing.T) {
        prepareTestEnv(t)
 
        session := loginUser(t, "user2", "password")
-       req, err := http.NewRequest("GET", "/user2/repo1/pulls", nil)
-       assert.NoError(t, err)
+       req := NewRequest(t, "GET", "/user2/repo1/pulls")
        resp := session.MakeRequest(t, req)
        assert.EqualValues(t, http.StatusOK, resp.HeaderCode)
        htmlDoc, err := NewHtmlParser(resp.Body)
@@ -24,8 +23,7 @@ func TestPullCompare(t *testing.T) {
        link, exists := htmlDoc.doc.Find(".navbar").Find(".ui.green.button").Attr("href")
        assert.True(t, exists, "The template has changed")
 
-       req, err = http.NewRequest("GET", link, nil)
-       assert.NoError(t, err)
+       req = NewRequest(t, "GET", link)
        resp = session.MakeRequest(t, req)
        assert.EqualValues(t, http.StatusOK, resp.HeaderCode)
 }

diff --git a/integrations/release_test.go b/integrations/release_test.go
index ec8ad360f45722ef6025a8c1079fcc8a73d0421a..8f29ddc63948e8537f927cd45554f19e80852927 100644 (file)
--- a/integrations/release_test.go
+++ b/integrations/release_test.go
@@ -15,8 +15,7 @@ func TestViewReleases(t *testing.T) {
        prepareTestEnv(t)
 
        session := loginUser(t, "user2", "password")
-       req, err := http.NewRequest("GET", "/user2/repo1/releases", nil)
-       assert.NoError(t, err)
+       req := NewRequest(t, "GET", "/user2/repo1/releases")
        resp := session.MakeRequest(t, req)
        assert.EqualValues(t, http.StatusOK, resp.HeaderCode)
 }

diff --git a/integrations/repo_commits_test.go b/integrations/repo_commits_test.go
index 9be9b78e53efb13318d5881e6aaa2395346a2280..476458e63f1d389c54856437c15f90f522a00222 100644 (file)
--- a/integrations/repo_commits_test.go
+++ b/integrations/repo_commits_test.go
@@ -19,8 +19,7 @@ func TestRepoCommits(t *testing.T) {
        session := loginUser(t, "user2", "password")
 
        // Request repository commits page
-       req, err := http.NewRequest("GET", "/user2/repo1/commits/master", nil)
-       assert.NoError(t, err)
+       req := NewRequest(t, "GET", "/user2/repo1/commits/master")
        resp := session.MakeRequest(t, req)
        assert.EqualValues(t, http.StatusOK, resp.HeaderCode)
 
@@ -37,8 +36,7 @@ func doTestRepoCommitWithStatus(t *testing.T, state string, classes ...string) {
        session := loginUser(t, "user2", "password")
 
        // Request repository commits page
-       req, err := http.NewRequest("GET", "/user2/repo1/commits/master", nil)
-       assert.NoError(t, err)
+       req := NewRequest(t, "GET", "/user2/repo1/commits/master")
        resp := session.MakeRequest(t, req)
        assert.EqualValues(t, http.StatusOK, resp.HeaderCode)
 
@@ -50,16 +48,14 @@ func doTestRepoCommitWithStatus(t *testing.T, state string, classes ...string) {
        assert.NotEmpty(t, commitURL)
 
        // Call API to add status for commit
-       req, err = http.NewRequest("POST", "/api/v1/repos/user2/repo1/statuses/"+path.Base(commitURL),
+       req = NewRequestBody(t, "POST", "/api/v1/repos/user2/repo1/statuses/"+path.Base(commitURL),
                bytes.NewBufferString("{\"state\":\""+state+"\", \"target_url\": \"http://test.ci/\", \"description\": \"\", \"context\": \"testci\"}"))
 
-       assert.NoError(t, err)
        req.Header.Add("Content-Type", "application/json")
        resp = session.MakeRequest(t, req)
        assert.EqualValues(t, http.StatusCreated, resp.HeaderCode)
 
-       req, err = http.NewRequest("GET", "/user2/repo1/commits/master", nil)
-       assert.NoError(t, err)
+       req = NewRequest(t, "GET", "/user2/repo1/commits/master")
        resp = session.MakeRequest(t, req)
        assert.EqualValues(t, http.StatusOK, resp.HeaderCode)
 

diff --git a/integrations/repo_fork_test.go b/integrations/repo_fork_test.go
index 15c096b1ab4af246b30ad643c865628008aca783..59a15d848394cf1dcd023e74d421255c0c333d2c 100644 (file)
--- a/integrations/repo_fork_test.go
+++ b/integrations/repo_fork_test.go
@@ -15,14 +15,12 @@ import (
 
 func testRepoFork(t *testing.T, session *TestSession) {
        // Step0: check the existence of the to-fork repo
-       req, err := http.NewRequest("GET", "/user1/repo1", nil)
-       assert.NoError(t, err)
+       req := NewRequest(t, "GET", "/user1/repo1")
        resp := session.MakeRequest(t, req)
        assert.EqualValues(t, http.StatusNotFound, resp.HeaderCode)
 
        // Step1: go to the main page of repo
-       req, err = http.NewRequest("GET", "/user2/repo1", nil)
-       assert.NoError(t, err)
+       req = NewRequest(t, "GET", "/user2/repo1")
        resp = session.MakeRequest(t, req)
        assert.EqualValues(t, http.StatusOK, resp.HeaderCode)
 
@@ -31,8 +29,7 @@ func testRepoFork(t *testing.T, session *TestSession) {
        assert.NoError(t, err)
        link, exists := htmlDoc.doc.Find("a.ui.button[href^=\"/repo/fork/\"]").Attr("href")
        assert.True(t, exists, "The template has changed")
-       req, err = http.NewRequest("GET", link, nil)
-       assert.NoError(t, err)
+       req = NewRequest(t, "GET", link)
        resp = session.MakeRequest(t, req)
        assert.EqualValues(t, http.StatusOK, resp.HeaderCode)
 
@@ -41,21 +38,19 @@ func testRepoFork(t *testing.T, session *TestSession) {
        assert.NoError(t, err)
        link, exists = htmlDoc.doc.Find("form.ui.form[action^=\"/repo/fork/\"]").Attr("action")
        assert.True(t, exists, "The template has changed")
-       req, err = http.NewRequest("POST", link,
+       req = NewRequestBody(t, "POST", link,
                bytes.NewBufferString(url.Values{
                        "_csrf":     []string{htmlDoc.GetInputValueByName("_csrf")},
                        "uid":       []string{"1"},
                        "repo_name": []string{"repo1"},
                }.Encode()),
        )
-       assert.NoError(t, err)
        req.Header.Add("Content-Type", "application/x-www-form-urlencoded")
        resp = session.MakeRequest(t, req)
        assert.EqualValues(t, http.StatusFound, resp.HeaderCode)
 
        // Step4: check the existence of the forked repo
-       req, err = http.NewRequest("GET", "/user1/repo1", nil)
-       assert.NoError(t, err)
+       req = NewRequest(t, "GET", "/user1/repo1")
        resp = session.MakeRequest(t, req)
        assert.EqualValues(t, http.StatusOK, resp.HeaderCode)
 }

diff --git a/integrations/repo_test.go b/integrations/repo_test.go
index 37874c275dc47c143dd0f4abd7d87c133facd0ec..130418f3fd09faaf1cef5de683fab06dc7ae1bb7 100644 (file)
--- a/integrations/repo_test.go
+++ b/integrations/repo_test.go
@@ -14,8 +14,7 @@ import (
 func TestViewRepo(t *testing.T) {
        prepareTestEnv(t)
 
-       req, err := http.NewRequest("GET", "/user2/repo1", nil)
-       assert.NoError(t, err)
+       req := NewRequest(t, "GET", "/user2/repo1")
        resp := MakeRequest(req)
        assert.EqualValues(t, http.StatusOK, resp.HeaderCode)
 }

diff --git a/integrations/signup_test.go b/integrations/signup_test.go
index 49017b29ff2fd0f0cd92c16156ff8e1a805f41dc..4bb84c1a201b728a96ee2d3b01a392ded52f1f3c 100644 (file)
--- a/integrations/signup_test.go
+++ b/integrations/signup_test.go
@@ -20,7 +20,7 @@ func TestSignup(t *testing.T) {
 
        setting.Service.EnableCaptcha = false
 
-       req, err := http.NewRequest("POST", "/user/sign_up",
+       req := NewRequestBody(t, "POST", "/user/sign_up",
                bytes.NewBufferString(url.Values{
                        "user_name": []string{"exampleUser"},
                        "email":     []string{"exampleUser@example.com"},
@@ -28,14 +28,12 @@ func TestSignup(t *testing.T) {
                        "retype":    []string{"examplePassword"},
                }.Encode()),
        )
-       assert.NoError(t, err)
        req.Header.Add("Content-Type", "application/x-www-form-urlencoded")
        resp := MakeRequest(req)
        assert.EqualValues(t, http.StatusFound, resp.HeaderCode)
 
        // should be able to view new user's page
-       req, err = http.NewRequest("GET", "/exampleUser", nil)
-       assert.NoError(t, err)
+       req = NewRequest(t, "GET", "/exampleUser")
        resp = MakeRequest(req)
        assert.EqualValues(t, http.StatusOK, resp.HeaderCode)
 }

diff --git a/integrations/user_test.go b/integrations/user_test.go
index f9358c16825e3b6cacf3e9e8d47edc500b1868d0..d3f7ca1b53b52c0787c3c72f293ebe1139b1fbd1 100644 (file)
--- a/integrations/user_test.go
+++ b/integrations/user_test.go
@@ -14,8 +14,7 @@ import (
 func TestViewUser(t *testing.T) {
        prepareTestEnv(t)
 
-       req, err := http.NewRequest("GET", "/user2", nil)
-       assert.NoError(t, err)
+       req := NewRequest(t, "GET", "/user2")
        resp := MakeRequest(req)
        assert.EqualValues(t, http.StatusOK, resp.HeaderCode)
 }

diff --git a/integrations/version_test.go b/integrations/version_test.go
index 72433574038516cb354bda5589daec5a483aad73..b5902a20a36759311419d0ddec1420cda7a7ac4f 100644 (file)
--- a/integrations/version_test.go
+++ b/integrations/version_test.go
@@ -20,8 +20,7 @@ func TestVersion(t *testing.T) {
        prepareTestEnv(t)
 
        setting.AppVer = "1.1.0+dev"
-       req, err := http.NewRequest("GET", "/api/v1/version", nil)
-       assert.NoError(t, err)
+       req := NewRequest(t, "GET", "/api/v1/version")
        resp := MakeRequest(req)
 
        var version gitea.ServerVersion