Skip to content

Commit 61716bd

Browse files
ethantkoenigappleboy
ethantkoenig
authored and
appleboy
committed
Display URLs in integration test logs (#1924)
1 parent 6d613fb commit 61716bd

15 files changed

+47
-71
lines changed

‎integrations/api_repo_test.go

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,15 @@ import (
1616
func TestAPIUserReposNotLogin(t *testing.T) {
1717
assert.NoError(t, models.LoadFixtures())
1818

19-
req, err := http.NewRequest("GET", "/api/v1/users/user2/repos", nil)
20-
assert.NoError(t, err)
19+
req := NewRequest(t, "GET", "/api/v1/users/user2/repos")
2120
resp := MakeRequest(req)
2221
assert.EqualValues(t, http.StatusOK, resp.HeaderCode)
2322
}
2423

2524
func TestAPISearchRepoNotLogin(t *testing.T) {
2625
assert.NoError(t, models.LoadFixtures())
2726

28-
req, err := http.NewRequest("GET", "/api/v1/repos/search?q=Test", nil)
29-
assert.NoError(t, err)
27+
req := NewRequest(t, "GET", "/api/v1/repos/search?q=Test")
3028
resp := MakeRequest(req)
3129
assert.EqualValues(t, http.StatusOK, resp.HeaderCode)
3230
}

‎integrations/api_team_test.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,7 @@ func TestAPITeam(t *testing.T) {
2525

2626
session := loginUser(t, user.Name, "password")
2727
url := fmt.Sprintf("/api/v1/teams/%d", teamUser.TeamID)
28-
req, err := http.NewRequest("GET", url, nil)
29-
assert.NoError(t, err)
28+
req := NewRequest(t, "GET", url)
3029
resp := session.MakeRequest(t, req)
3130
assert.EqualValues(t, http.StatusOK, resp.HeaderCode)
3231

‎integrations/delete_user_test.go

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,18 +20,16 @@ func TestDeleteUser(t *testing.T) {
2020

2121
session := loginUser(t, "user1", "password")
2222

23-
req, err := http.NewRequest("GET", "/admin/users/8", nil)
24-
assert.NoError(t, err)
23+
req := NewRequest(t, "GET", "/admin/users/8")
2524
resp := session.MakeRequest(t, req)
2625
assert.EqualValues(t, http.StatusOK, resp.HeaderCode)
2726

2827
doc, err := NewHtmlParser(resp.Body)
2928
assert.NoError(t, err)
30-
req, err = http.NewRequest("POST", "/admin/users/8/delete",
29+
req = NewRequestBody(t, "POST", "/admin/users/8/delete",
3130
bytes.NewBufferString(url.Values{
3231
"_csrf": []string{doc.GetInputValueByName("_csrf")},
3332
}.Encode()))
34-
assert.NoError(t, err)
3533
req.Header.Add("Content-Type", "application/x-www-form-urlencoded")
3634
resp = session.MakeRequest(t, req)
3735
assert.EqualValues(t, http.StatusOK, resp.HeaderCode)

‎integrations/editor_test.go

Lines changed: 9 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@ func TestCreateFile(t *testing.T) {
2020
session := loginUser(t, "user2", "password")
2121

2222
// Request editor page
23-
req, err := http.NewRequest("GET", "/user2/repo1/_new/master/", nil)
24-
assert.NoError(t, err)
23+
req := NewRequest(t, "GET", "/user2/repo1/_new/master/")
2524
resp := session.MakeRequest(t, req)
2625
assert.EqualValues(t, http.StatusOK, resp.HeaderCode)
2726

@@ -31,7 +30,7 @@ func TestCreateFile(t *testing.T) {
3130
assert.NotEmpty(t, lastCommit)
3231

3332
// Save new file to master branch
34-
req, err = http.NewRequest("POST", "/user2/repo1/_new/master/",
33+
req = NewRequestBody(t, "POST", "/user2/repo1/_new/master/",
3534
bytes.NewBufferString(url.Values{
3635
"_csrf": []string{doc.GetInputValueByName("_csrf")},
3736
"last_commit": []string{lastCommit},
@@ -40,7 +39,6 @@ func TestCreateFile(t *testing.T) {
4039
"commit_choice": []string{"direct"},
4140
}.Encode()),
4241
)
43-
assert.NoError(t, err)
4442
req.Header.Add("Content-Type", "application/x-www-form-urlencoded")
4543
resp = session.MakeRequest(t, req)
4644
assert.EqualValues(t, http.StatusFound, resp.HeaderCode)
@@ -52,16 +50,15 @@ func TestCreateFileOnProtectedBranch(t *testing.T) {
5250
session := loginUser(t, "user2", "password")
5351

5452
// Open repository branch settings
55-
req, err := http.NewRequest("GET", "/user2/repo1/settings/branches", nil)
56-
assert.NoError(t, err)
53+
req := NewRequest(t, "GET", "/user2/repo1/settings/branches")
5754
resp := session.MakeRequest(t, req)
5855
assert.EqualValues(t, http.StatusOK, resp.HeaderCode)
5956

6057
doc, err := NewHtmlParser(resp.Body)
6158
assert.NoError(t, err)
6259

6360
// Change master branch to protected
64-
req, err = http.NewRequest("POST", "/user2/repo1/settings/branches?action=protected_branch",
61+
req = NewRequestBody(t, "POST", "/user2/repo1/settings/branches?action=protected_branch",
6562
bytes.NewBufferString(url.Values{
6663
"_csrf": []string{doc.GetInputValueByName("_csrf")},
6764
"branchName": []string{"master"},
@@ -78,8 +75,7 @@ func TestCreateFileOnProtectedBranch(t *testing.T) {
7875
assert.EqualValues(t, flashCookie.Value, "success%3Dmaster%2BLocked%2Bsuccessfully")
7976

8077
// Request editor page
81-
req, err = http.NewRequest("GET", "/user2/repo1/_new/master/", nil)
82-
assert.NoError(t, err)
78+
req = NewRequest(t, "GET", "/user2/repo1/_new/master/")
8379
resp = session.MakeRequest(t, req)
8480
assert.EqualValues(t, http.StatusOK, resp.HeaderCode)
8581

@@ -89,7 +85,7 @@ func TestCreateFileOnProtectedBranch(t *testing.T) {
8985
assert.NotEmpty(t, lastCommit)
9086

9187
// Save new file to master branch
92-
req, err = http.NewRequest("POST", "/user2/repo1/_new/master/",
88+
req = NewRequestBody(t, "POST", "/user2/repo1/_new/master/",
9389
bytes.NewBufferString(url.Values{
9490
"_csrf": []string{doc.GetInputValueByName("_csrf")},
9591
"last_commit": []string{lastCommit},
@@ -98,7 +94,6 @@ func TestCreateFileOnProtectedBranch(t *testing.T) {
9894
"commit_choice": []string{"direct"},
9995
}.Encode()),
10096
)
101-
assert.NoError(t, err)
10297
req.Header.Add("Content-Type", "application/x-www-form-urlencoded")
10398
resp = session.MakeRequest(t, req)
10499
assert.EqualValues(t, http.StatusOK, resp.HeaderCode)
@@ -111,8 +106,7 @@ func testEditFile(t *testing.T, session *TestSession, user, repo, branch, filePa
111106
newContent := "Hello, World (Edited)\n"
112107

113108
// Get to the 'edit this file' page
114-
req, err := http.NewRequest("GET", path.Join(user, repo, "_edit", branch, filePath), nil)
115-
assert.NoError(t, err)
109+
req := NewRequest(t, "GET", path.Join(user, repo, "_edit", branch, filePath))
116110
resp := session.MakeRequest(t, req)
117111
assert.EqualValues(t, http.StatusOK, resp.HeaderCode)
118112

@@ -122,7 +116,7 @@ func testEditFile(t *testing.T, session *TestSession, user, repo, branch, filePa
122116
assert.NotEmpty(t, lastCommit)
123117

124118
// Submit the edits
125-
req, err = http.NewRequest("POST", path.Join(user, repo, "_edit", branch, filePath),
119+
req = NewRequestBody(t, "POST", path.Join(user, repo, "_edit", branch, filePath),
126120
bytes.NewBufferString(url.Values{
127121
"_csrf": []string{htmlDoc.GetInputValueByName("_csrf")},
128122
"last_commit": []string{lastCommit},
@@ -131,14 +125,12 @@ func testEditFile(t *testing.T, session *TestSession, user, repo, branch, filePa
131125
"commit_choice": []string{"direct"},
132126
}.Encode()),
133127
)
134-
assert.NoError(t, err)
135128
req.Header.Add("Content-Type", "application/x-www-form-urlencoded")
136129
resp = session.MakeRequest(t, req)
137130
assert.EqualValues(t, http.StatusFound, resp.HeaderCode)
138131

139132
// Verify the change
140-
req, err = http.NewRequest("GET", path.Join(user, repo, "raw", branch, filePath), nil)
141-
assert.NoError(t, err)
133+
req = NewRequest(t, "GET", path.Join(user, repo, "raw", branch, filePath))
142134
resp = session.MakeRequest(t, req)
143135
assert.EqualValues(t, http.StatusOK, resp.HeaderCode)
144136
assert.EqualValues(t, newContent, string(resp.Body))

‎integrations/integration_test.go

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -147,22 +147,20 @@ func (s *TestSession) MakeRequest(t *testing.T, req *http.Request) *TestResponse
147147
}
148148

149149
func loginUser(t *testing.T, userName, password string) *TestSession {
150-
req, err := http.NewRequest("GET", "/user/login", nil)
151-
assert.NoError(t, err)
150+
req := NewRequest(t, "GET", "/user/login")
152151
resp := MakeRequest(req)
153152
assert.EqualValues(t, http.StatusOK, resp.HeaderCode)
154153

155154
doc, err := NewHtmlParser(resp.Body)
156155
assert.NoError(t, err)
157156

158-
req, err = http.NewRequest("POST", "/user/login",
157+
req = NewRequestBody(t, "POST", "/user/login",
159158
bytes.NewBufferString(url.Values{
160159
"_csrf": []string{doc.GetInputValueByName("_csrf")},
161160
"user_name": []string{userName},
162161
"password": []string{password},
163162
}.Encode()),
164163
)
165-
assert.NoError(t, err)
166164
req.Header.Add("Content-Type", "application/x-www-form-urlencoded")
167165
resp = MakeRequest(req)
168166
assert.EqualValues(t, http.StatusFound, resp.HeaderCode)
@@ -204,6 +202,17 @@ type TestResponse struct {
204202
Headers http.Header
205203
}
206204

205+
func NewRequest(t *testing.T, method, url string) *http.Request {
206+
return NewRequestBody(t, method, url, nil)
207+
}
208+
209+
func NewRequestBody(t *testing.T, method, url string, body io.Reader) *http.Request {
210+
request, err := http.NewRequest(method, url, body)
211+
assert.NoError(t, err)
212+
request.RequestURI = url
213+
return request
214+
}
215+
207216
func MakeRequest(req *http.Request) *TestResponse {
208217
buffer := bytes.NewBuffer(nil)
209218
respWriter := &TestResponseWriter{

‎integrations/internal_test.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,10 @@ import (
1919

2020
func assertProtectedBranch(t *testing.T, repoID int64, branchName string, isErr, canPush bool) {
2121
reqURL := fmt.Sprintf("/api/internal/branch/%d/%s", repoID, url.QueryEscape(branchName))
22-
req, err := http.NewRequest("GET", reqURL, nil)
22+
req := NewRequest(t, "GET", reqURL)
2323
t.Log(reqURL)
2424
req.Header.Add("Authorization", fmt.Sprintf("Bearer %s", setting.InternalToken))
2525

26-
assert.NoError(t, err)
2726
resp := MakeRequest(req)
2827
if isErr {
2928
assert.EqualValues(t, 500, resp.HeaderCode)

‎integrations/issue_test.go

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,15 @@ import (
1414
func TestNoLoginViewIssues(t *testing.T) {
1515
prepareTestEnv(t)
1616

17-
req, err := http.NewRequest("GET", "/user2/repo1/issues", nil)
18-
assert.NoError(t, err)
17+
req := NewRequest(t, "GET", "/user2/repo1/issues")
1918
resp := MakeRequest(req)
2019
assert.EqualValues(t, http.StatusOK, resp.HeaderCode)
2120
}
2221

2322
func TestNoLoginViewIssue(t *testing.T) {
2423
prepareTestEnv(t)
2524

26-
req, err := http.NewRequest("GET", "/user2/repo1/issues/1", nil)
27-
assert.NoError(t, err)
25+
req := NewRequest(t, "GET", "/user2/repo1/issues/1")
2826
resp := MakeRequest(req)
2927
assert.EqualValues(t, http.StatusOK, resp.HeaderCode)
3028
}

‎integrations/pull_compare_test.go

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,15 @@ func TestPullCompare(t *testing.T) {
1515
prepareTestEnv(t)
1616

1717
session := loginUser(t, "user2", "password")
18-
req, err := http.NewRequest("GET", "/user2/repo1/pulls", nil)
19-
assert.NoError(t, err)
18+
req := NewRequest(t, "GET", "/user2/repo1/pulls")
2019
resp := session.MakeRequest(t, req)
2120
assert.EqualValues(t, http.StatusOK, resp.HeaderCode)
2221
htmlDoc, err := NewHtmlParser(resp.Body)
2322
assert.NoError(t, err)
2423
link, exists := htmlDoc.doc.Find(".navbar").Find(".ui.green.button").Attr("href")
2524
assert.True(t, exists, "The template has changed")
2625

27-
req, err = http.NewRequest("GET", link, nil)
28-
assert.NoError(t, err)
26+
req = NewRequest(t, "GET", link)
2927
resp = session.MakeRequest(t, req)
3028
assert.EqualValues(t, http.StatusOK, resp.HeaderCode)
3129
}

‎integrations/release_test.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@ func TestViewReleases(t *testing.T) {
1515
prepareTestEnv(t)
1616

1717
session := loginUser(t, "user2", "password")
18-
req, err := http.NewRequest("GET", "/user2/repo1/releases", nil)
19-
assert.NoError(t, err)
18+
req := NewRequest(t, "GET", "/user2/repo1/releases")
2019
resp := session.MakeRequest(t, req)
2120
assert.EqualValues(t, http.StatusOK, resp.HeaderCode)
2221
}

‎integrations/repo_commits_test.go

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@ func TestRepoCommits(t *testing.T) {
1919
session := loginUser(t, "user2", "password")
2020

2121
// Request repository commits page
22-
req, err := http.NewRequest("GET", "/user2/repo1/commits/master", nil)
23-
assert.NoError(t, err)
22+
req := NewRequest(t, "GET", "/user2/repo1/commits/master")
2423
resp := session.MakeRequest(t, req)
2524
assert.EqualValues(t, http.StatusOK, resp.HeaderCode)
2625

@@ -37,8 +36,7 @@ func doTestRepoCommitWithStatus(t *testing.T, state string, classes ...string) {
3736
session := loginUser(t, "user2", "password")
3837

3938
// Request repository commits page
40-
req, err := http.NewRequest("GET", "/user2/repo1/commits/master", nil)
41-
assert.NoError(t, err)
39+
req := NewRequest(t, "GET", "/user2/repo1/commits/master")
4240
resp := session.MakeRequest(t, req)
4341
assert.EqualValues(t, http.StatusOK, resp.HeaderCode)
4442

@@ -50,16 +48,14 @@ func doTestRepoCommitWithStatus(t *testing.T, state string, classes ...string) {
5048
assert.NotEmpty(t, commitURL)
5149

5250
// Call API to add status for commit
53-
req, err = http.NewRequest("POST", "/api/v1/repos/user2/repo1/statuses/"+path.Base(commitURL),
51+
req = NewRequestBody(t, "POST", "/api/v1/repos/user2/repo1/statuses/"+path.Base(commitURL),
5452
bytes.NewBufferString("{\"state\":\""+state+"\", \"target_url\": \"http://test.ci/\", \"description\": \"\", \"context\": \"testci\"}"))
5553

56-
assert.NoError(t, err)
5754
req.Header.Add("Content-Type", "application/json")
5855
resp = session.MakeRequest(t, req)
5956
assert.EqualValues(t, http.StatusCreated, resp.HeaderCode)
6057

61-
req, err = http.NewRequest("GET", "/user2/repo1/commits/master", nil)
62-
assert.NoError(t, err)
58+
req = NewRequest(t, "GET", "/user2/repo1/commits/master")
6359
resp = session.MakeRequest(t, req)
6460
assert.EqualValues(t, http.StatusOK, resp.HeaderCode)
6561

‎integrations/repo_fork_test.go

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,12 @@ import (
1515

1616
func testRepoFork(t *testing.T, session *TestSession) {
1717
// Step0: check the existence of the to-fork repo
18-
req, err := http.NewRequest("GET", "/user1/repo1", nil)
19-
assert.NoError(t, err)
18+
req := NewRequest(t, "GET", "/user1/repo1")
2019
resp := session.MakeRequest(t, req)
2120
assert.EqualValues(t, http.StatusNotFound, resp.HeaderCode)
2221

2322
// Step1: go to the main page of repo
24-
req, err = http.NewRequest("GET", "/user2/repo1", nil)
25-
assert.NoError(t, err)
23+
req = NewRequest(t, "GET", "/user2/repo1")
2624
resp = session.MakeRequest(t, req)
2725
assert.EqualValues(t, http.StatusOK, resp.HeaderCode)
2826

@@ -31,8 +29,7 @@ func testRepoFork(t *testing.T, session *TestSession) {
3129
assert.NoError(t, err)
3230
link, exists := htmlDoc.doc.Find("a.ui.button[href^=\"/repo/fork/\"]").Attr("href")
3331
assert.True(t, exists, "The template has changed")
34-
req, err = http.NewRequest("GET", link, nil)
35-
assert.NoError(t, err)
32+
req = NewRequest(t, "GET", link)
3633
resp = session.MakeRequest(t, req)
3734
assert.EqualValues(t, http.StatusOK, resp.HeaderCode)
3835

@@ -41,21 +38,19 @@ func testRepoFork(t *testing.T, session *TestSession) {
4138
assert.NoError(t, err)
4239
link, exists = htmlDoc.doc.Find("form.ui.form[action^=\"/repo/fork/\"]").Attr("action")
4340
assert.True(t, exists, "The template has changed")
44-
req, err = http.NewRequest("POST", link,
41+
req = NewRequestBody(t, "POST", link,
4542
bytes.NewBufferString(url.Values{
4643
"_csrf": []string{htmlDoc.GetInputValueByName("_csrf")},
4744
"uid": []string{"1"},
4845
"repo_name": []string{"repo1"},
4946
}.Encode()),
5047
)
51-
assert.NoError(t, err)
5248
req.Header.Add("Content-Type", "application/x-www-form-urlencoded")
5349
resp = session.MakeRequest(t, req)
5450
assert.EqualValues(t, http.StatusFound, resp.HeaderCode)
5551

5652
// Step4: check the existence of the forked repo
57-
req, err = http.NewRequest("GET", "/user1/repo1", nil)
58-
assert.NoError(t, err)
53+
req = NewRequest(t, "GET", "/user1/repo1")
5954
resp = session.MakeRequest(t, req)
6055
assert.EqualValues(t, http.StatusOK, resp.HeaderCode)
6156
}

‎integrations/repo_test.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@ import (
1414
func TestViewRepo(t *testing.T) {
1515
prepareTestEnv(t)
1616

17-
req, err := http.NewRequest("GET", "/user2/repo1", nil)
18-
assert.NoError(t, err)
17+
req := NewRequest(t, "GET", "/user2/repo1")
1918
resp := MakeRequest(req)
2019
assert.EqualValues(t, http.StatusOK, resp.HeaderCode)
2120
}

‎integrations/signup_test.go

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,22 +20,20 @@ func TestSignup(t *testing.T) {
2020

2121
setting.Service.EnableCaptcha = false
2222

23-
req, err := http.NewRequest("POST", "/user/sign_up",
23+
req := NewRequestBody(t, "POST", "/user/sign_up",
2424
bytes.NewBufferString(url.Values{
2525
"user_name": []string{"exampleUser"},
2626
"email": []string{"[email protected]"},
2727
"password": []string{"examplePassword"},
2828
"retype": []string{"examplePassword"},
2929
}.Encode()),
3030
)
31-
assert.NoError(t, err)
3231
req.Header.Add("Content-Type", "application/x-www-form-urlencoded")
3332
resp := MakeRequest(req)
3433
assert.EqualValues(t, http.StatusFound, resp.HeaderCode)
3534

3635
// should be able to view new user's page
37-
req, err = http.NewRequest("GET", "/exampleUser", nil)
38-
assert.NoError(t, err)
36+
req = NewRequest(t, "GET", "/exampleUser")
3937
resp = MakeRequest(req)
4038
assert.EqualValues(t, http.StatusOK, resp.HeaderCode)
4139
}

‎integrations/user_test.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@ import (
1414
func TestViewUser(t *testing.T) {
1515
prepareTestEnv(t)
1616

17-
req, err := http.NewRequest("GET", "/user2", nil)
18-
assert.NoError(t, err)
17+
req := NewRequest(t, "GET", "/user2")
1918
resp := MakeRequest(req)
2019
assert.EqualValues(t, http.StatusOK, resp.HeaderCode)
2120
}

0 commit comments

Comments
 (0)