loading up the forgejo repo on tangled to test page performance
Disable query token param in integration tests (#28592)
Follow up to https://github.com/go-gitea/gitea/pull/28484, this PR
enables the setting for integration tests and migrates a few additional
test queries.
+45
-52
+27
-28
tests/integration/api_issue_test.go
+27
-28
tests/integration/api_issue_test.go
···
216
216
func TestAPISearchIssues(t *testing.T) {
217
217
defer tests.PrepareTestEnv(t)()
218
218
219
-
token := getUserToken(t, "user2", auth_model.AccessTokenScopeReadIssue)
220
-
221
219
// as this API was used in the frontend, it uses UI page size
222
220
expectedIssueCount := 18 // from the fixtures
223
221
if expectedIssueCount > setting.UI.IssuePagingNum {
···
225
223
}
226
224
227
225
link, _ := url.Parse("/api/v1/repos/issues/search")
228
-
query := url.Values{"token": {getUserToken(t, "user1", auth_model.AccessTokenScopeReadIssue)}}
226
+
token := getUserToken(t, "user1", auth_model.AccessTokenScopeReadIssue)
227
+
query := url.Values{}
229
228
var apiIssues []*api.Issue
230
229
231
230
link.RawQuery = query.Encode()
232
-
req := NewRequest(t, "GET", link.String())
231
+
req := NewRequest(t, "GET", link.String()).AddTokenAuth(token)
233
232
resp := MakeRequest(t, req, http.StatusOK)
234
233
DecodeJSON(t, resp, &apiIssues)
235
234
assert.Len(t, apiIssues, expectedIssueCount)
···
238
237
before := time.Unix(999307200, 0).Format(time.RFC3339)
239
238
query.Add("since", since)
240
239
query.Add("before", before)
241
-
query.Add("token", token)
242
240
link.RawQuery = query.Encode()
243
-
req = NewRequest(t, "GET", link.String())
241
+
req = NewRequest(t, "GET", link.String()).AddTokenAuth(token)
244
242
resp = MakeRequest(t, req, http.StatusOK)
245
243
DecodeJSON(t, resp, &apiIssues)
246
244
assert.Len(t, apiIssues, 11)
···
249
247
250
248
query.Add("state", "closed")
251
249
link.RawQuery = query.Encode()
252
-
req = NewRequest(t, "GET", link.String())
250
+
req = NewRequest(t, "GET", link.String()).AddTokenAuth(token)
253
251
resp = MakeRequest(t, req, http.StatusOK)
254
252
DecodeJSON(t, resp, &apiIssues)
255
253
assert.Len(t, apiIssues, 2)
256
254
257
255
query.Set("state", "all")
258
256
link.RawQuery = query.Encode()
259
-
req = NewRequest(t, "GET", link.String())
257
+
req = NewRequest(t, "GET", link.String()).AddTokenAuth(token)
260
258
resp = MakeRequest(t, req, http.StatusOK)
261
259
DecodeJSON(t, resp, &apiIssues)
262
260
assert.EqualValues(t, "20", resp.Header().Get("X-Total-Count"))
···
264
262
265
263
query.Add("limit", "10")
266
264
link.RawQuery = query.Encode()
267
-
req = NewRequest(t, "GET", link.String())
265
+
req = NewRequest(t, "GET", link.String()).AddTokenAuth(token)
268
266
resp = MakeRequest(t, req, http.StatusOK)
269
267
DecodeJSON(t, resp, &apiIssues)
270
268
assert.EqualValues(t, "20", resp.Header().Get("X-Total-Count"))
271
269
assert.Len(t, apiIssues, 10)
272
270
273
-
query = url.Values{"assigned": {"true"}, "state": {"all"}, "token": {token}}
271
+
query = url.Values{"assigned": {"true"}, "state": {"all"}}
274
272
link.RawQuery = query.Encode()
275
-
req = NewRequest(t, "GET", link.String())
273
+
req = NewRequest(t, "GET", link.String()).AddTokenAuth(token)
276
274
resp = MakeRequest(t, req, http.StatusOK)
277
275
DecodeJSON(t, resp, &apiIssues)
278
276
assert.Len(t, apiIssues, 2)
279
277
280
-
query = url.Values{"milestones": {"milestone1"}, "state": {"all"}, "token": {token}}
278
+
query = url.Values{"milestones": {"milestone1"}, "state": {"all"}}
281
279
link.RawQuery = query.Encode()
282
-
req = NewRequest(t, "GET", link.String())
280
+
req = NewRequest(t, "GET", link.String()).AddTokenAuth(token)
283
281
resp = MakeRequest(t, req, http.StatusOK)
284
282
DecodeJSON(t, resp, &apiIssues)
285
283
assert.Len(t, apiIssues, 1)
286
284
287
-
query = url.Values{"milestones": {"milestone1,milestone3"}, "state": {"all"}, "token": {token}}
285
+
query = url.Values{"milestones": {"milestone1,milestone3"}, "state": {"all"}}
288
286
link.RawQuery = query.Encode()
289
-
req = NewRequest(t, "GET", link.String())
287
+
req = NewRequest(t, "GET", link.String()).AddTokenAuth(token)
290
288
resp = MakeRequest(t, req, http.StatusOK)
291
289
DecodeJSON(t, resp, &apiIssues)
292
290
assert.Len(t, apiIssues, 2)
293
291
294
-
query = url.Values{"owner": {"user2"}, "token": {token}} // user
292
+
query = url.Values{"owner": {"user2"}} // user
295
293
link.RawQuery = query.Encode()
296
-
req = NewRequest(t, "GET", link.String())
294
+
req = NewRequest(t, "GET", link.String()).AddTokenAuth(token)
297
295
resp = MakeRequest(t, req, http.StatusOK)
298
296
DecodeJSON(t, resp, &apiIssues)
299
297
assert.Len(t, apiIssues, 8)
300
298
301
-
query = url.Values{"owner": {"org3"}, "token": {token}} // organization
299
+
query = url.Values{"owner": {"org3"}} // organization
302
300
link.RawQuery = query.Encode()
303
-
req = NewRequest(t, "GET", link.String())
301
+
req = NewRequest(t, "GET", link.String()).AddTokenAuth(token)
304
302
resp = MakeRequest(t, req, http.StatusOK)
305
303
DecodeJSON(t, resp, &apiIssues)
306
304
assert.Len(t, apiIssues, 5)
307
305
308
-
query = url.Values{"owner": {"org3"}, "team": {"team1"}, "token": {token}} // organization + team
306
+
query = url.Values{"owner": {"org3"}, "team": {"team1"}} // organization + team
309
307
link.RawQuery = query.Encode()
310
-
req = NewRequest(t, "GET", link.String())
308
+
req = NewRequest(t, "GET", link.String()).AddTokenAuth(token)
311
309
resp = MakeRequest(t, req, http.StatusOK)
312
310
DecodeJSON(t, resp, &apiIssues)
313
311
assert.Len(t, apiIssues, 2)
···
323
321
}
324
322
325
323
link, _ := url.Parse("/api/v1/repos/issues/search")
326
-
query := url.Values{"token": {getUserToken(t, "user1", auth_model.AccessTokenScopeReadIssue)}}
324
+
token := getUserToken(t, "user1", auth_model.AccessTokenScopeReadIssue)
325
+
query := url.Values{}
327
326
var apiIssues []*api.Issue
328
327
329
328
link.RawQuery = query.Encode()
330
-
req := NewRequest(t, "GET", link.String())
329
+
req := NewRequest(t, "GET", link.String()).AddTokenAuth(token)
331
330
resp := MakeRequest(t, req, http.StatusOK)
332
331
DecodeJSON(t, resp, &apiIssues)
333
332
assert.Len(t, apiIssues, expectedIssueCount)
334
333
335
334
query.Add("labels", "label1")
336
335
link.RawQuery = query.Encode()
337
-
req = NewRequest(t, "GET", link.String())
336
+
req = NewRequest(t, "GET", link.String()).AddTokenAuth(token)
338
337
resp = MakeRequest(t, req, http.StatusOK)
339
338
DecodeJSON(t, resp, &apiIssues)
340
339
assert.Len(t, apiIssues, 2)
···
342
341
// multiple labels
343
342
query.Set("labels", "label1,label2")
344
343
link.RawQuery = query.Encode()
345
-
req = NewRequest(t, "GET", link.String())
344
+
req = NewRequest(t, "GET", link.String()).AddTokenAuth(token)
346
345
resp = MakeRequest(t, req, http.StatusOK)
347
346
DecodeJSON(t, resp, &apiIssues)
348
347
assert.Len(t, apiIssues, 2)
···
350
349
// an org label
351
350
query.Set("labels", "orglabel4")
352
351
link.RawQuery = query.Encode()
353
-
req = NewRequest(t, "GET", link.String())
352
+
req = NewRequest(t, "GET", link.String()).AddTokenAuth(token)
354
353
resp = MakeRequest(t, req, http.StatusOK)
355
354
DecodeJSON(t, resp, &apiIssues)
356
355
assert.Len(t, apiIssues, 1)
···
359
358
query.Set("labels", "label2,orglabel4")
360
359
query.Add("state", "all")
361
360
link.RawQuery = query.Encode()
362
-
req = NewRequest(t, "GET", link.String())
361
+
req = NewRequest(t, "GET", link.String()).AddTokenAuth(token)
363
362
resp = MakeRequest(t, req, http.StatusOK)
364
363
DecodeJSON(t, resp, &apiIssues)
365
364
assert.Len(t, apiIssues, 2)
···
367
366
// org and repo label which share the same issue
368
367
query.Set("labels", "label1,orglabel4")
369
368
link.RawQuery = query.Encode()
370
-
req = NewRequest(t, "GET", link.String())
369
+
req = NewRequest(t, "GET", link.String()).AddTokenAuth(token)
371
370
resp = MakeRequest(t, req, http.StatusOK)
372
371
DecodeJSON(t, resp, &apiIssues)
373
372
assert.Len(t, apiIssues, 2)
+1
-2
tests/integration/api_releases_test.go
+1
-2
tests/integration/api_releases_test.go
···
32
32
token := getUserToken(t, user2.LowerName, auth_model.AccessTokenScopeReadRepository)
33
33
34
34
link, _ := url.Parse(fmt.Sprintf("/api/v1/repos/%s/%s/releases", user2.Name, repo.Name))
35
-
link.RawQuery = url.Values{"token": {token}}.Encode()
36
-
resp := MakeRequest(t, NewRequest(t, "GET", link.String()), http.StatusOK)
35
+
resp := MakeRequest(t, NewRequest(t, "GET", link.String()).AddTokenAuth(token), http.StatusOK)
37
36
var apiReleases []*api.Release
38
37
DecodeJSON(t, resp, &apiReleases)
39
38
if assert.Len(t, apiReleases, 3) {
+4
-8
tests/integration/api_repo_archive_test.go
+4
-8
tests/integration/api_repo_archive_test.go
···
28
28
token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeReadRepository)
29
29
30
30
link, _ := url.Parse(fmt.Sprintf("/api/v1/repos/%s/%s/archive/master.zip", user2.Name, repo.Name))
31
-
link.RawQuery = url.Values{"token": {token}}.Encode()
32
-
resp := MakeRequest(t, NewRequest(t, "GET", link.String()), http.StatusOK)
31
+
resp := MakeRequest(t, NewRequest(t, "GET", link.String()).AddTokenAuth(token), http.StatusOK)
33
32
bs, err := io.ReadAll(resp.Body)
34
33
assert.NoError(t, err)
35
34
assert.Len(t, bs, 320)
36
35
37
36
link, _ = url.Parse(fmt.Sprintf("/api/v1/repos/%s/%s/archive/master.tar.gz", user2.Name, repo.Name))
38
-
link.RawQuery = url.Values{"token": {token}}.Encode()
39
-
resp = MakeRequest(t, NewRequest(t, "GET", link.String()), http.StatusOK)
37
+
resp = MakeRequest(t, NewRequest(t, "GET", link.String()).AddTokenAuth(token), http.StatusOK)
40
38
bs, err = io.ReadAll(resp.Body)
41
39
assert.NoError(t, err)
42
40
assert.Len(t, bs, 266)
43
41
44
42
link, _ = url.Parse(fmt.Sprintf("/api/v1/repos/%s/%s/archive/master.bundle", user2.Name, repo.Name))
45
-
link.RawQuery = url.Values{"token": {token}}.Encode()
46
-
resp = MakeRequest(t, NewRequest(t, "GET", link.String()), http.StatusOK)
43
+
resp = MakeRequest(t, NewRequest(t, "GET", link.String()).AddTokenAuth(token), http.StatusOK)
47
44
bs, err = io.ReadAll(resp.Body)
48
45
assert.NoError(t, err)
49
46
assert.Len(t, bs, 382)
50
47
51
48
link, _ = url.Parse(fmt.Sprintf("/api/v1/repos/%s/%s/archive/master", user2.Name, repo.Name))
52
-
link.RawQuery = url.Values{"token": {token}}.Encode()
53
-
MakeRequest(t, NewRequest(t, "GET", link.String()), http.StatusBadRequest)
49
+
MakeRequest(t, NewRequest(t, "GET", link.String()).AddTokenAuth(token), http.StatusBadRequest)
54
50
}
+9
-14
tests/integration/api_repo_branch_test.go
+9
-14
tests/integration/api_repo_branch_test.go
···
31
31
token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteRepository)
32
32
33
33
link, _ := url.Parse(fmt.Sprintf("/api/v1/repos/org3/%s/branches", repo3.Name)) // a plain repo
34
-
link.RawQuery = url.Values{"token": {token}}.Encode()
35
-
resp := MakeRequest(t, NewRequest(t, "GET", link.String()), http.StatusOK)
34
+
resp := MakeRequest(t, NewRequest(t, "GET", link.String()).AddTokenAuth(token), http.StatusOK)
36
35
bs, err := io.ReadAll(resp.Body)
37
36
assert.NoError(t, err)
38
37
···
43
42
assert.EqualValues(t, "master", branches[1].Name)
44
43
45
44
link2, _ := url.Parse(fmt.Sprintf("/api/v1/repos/org3/%s/branches/test_branch", repo3.Name))
46
-
link2.RawQuery = url.Values{"token": {token}}.Encode()
47
-
resp = MakeRequest(t, NewRequest(t, "GET", link2.String()), http.StatusOK)
45
+
resp = MakeRequest(t, NewRequest(t, "GET", link2.String()).AddTokenAuth(token), http.StatusOK)
48
46
bs, err = io.ReadAll(resp.Body)
49
47
assert.NoError(t, err)
50
48
var branch api.Branch
51
49
assert.NoError(t, json.Unmarshal(bs, &branch))
52
50
assert.EqualValues(t, "test_branch", branch.Name)
53
51
54
-
req := NewRequest(t, "POST", link.String())
52
+
req := NewRequest(t, "POST", link.String()).AddTokenAuth(token)
55
53
req.Header.Add("Content-Type", "application/json")
56
54
req.Body = io.NopCloser(bytes.NewBufferString(`{"new_branch_name":"test_branch2", "old_branch_name": "test_branch", "old_ref_name":"refs/heads/test_branch"}`))
57
55
resp = MakeRequest(t, req, http.StatusCreated)
···
62
60
assert.EqualValues(t, "test_branch2", branch2.Name)
63
61
assert.EqualValues(t, branch.Commit.ID, branch2.Commit.ID)
64
62
65
-
resp = MakeRequest(t, NewRequest(t, "GET", link.String()), http.StatusOK)
63
+
resp = MakeRequest(t, NewRequest(t, "GET", link.String()).AddTokenAuth(token), http.StatusOK)
66
64
bs, err = io.ReadAll(resp.Body)
67
65
assert.NoError(t, err)
68
66
···
76
74
link3, _ := url.Parse(fmt.Sprintf("/api/v1/repos/org3/%s/branches/test_branch2", repo3.Name))
77
75
MakeRequest(t, NewRequest(t, "DELETE", link3.String()), http.StatusNotFound)
78
76
79
-
link3.RawQuery = url.Values{"token": {token}}.Encode()
80
-
MakeRequest(t, NewRequest(t, "DELETE", link3.String()), http.StatusNoContent)
77
+
MakeRequest(t, NewRequest(t, "DELETE", link3.String()).AddTokenAuth(token), http.StatusNoContent)
81
78
assert.NoError(t, err)
82
79
})
83
80
}
···
91
88
token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteRepository)
92
89
93
90
link, _ := url.Parse(fmt.Sprintf("/api/v1/repos/org3/%s/branches", repo5.Name)) // a mirror repo
94
-
link.RawQuery = url.Values{"token": {token}}.Encode()
95
-
resp := MakeRequest(t, NewRequest(t, "GET", link.String()), http.StatusOK)
91
+
resp := MakeRequest(t, NewRequest(t, "GET", link.String()).AddTokenAuth(token), http.StatusOK)
96
92
bs, err := io.ReadAll(resp.Body)
97
93
assert.NoError(t, err)
98
94
···
103
99
assert.EqualValues(t, "master", branches[1].Name)
104
100
105
101
link2, _ := url.Parse(fmt.Sprintf("/api/v1/repos/org3/%s/branches/test_branch", repo5.Name))
106
-
link2.RawQuery = url.Values{"token": {token}}.Encode()
107
-
resp = MakeRequest(t, NewRequest(t, "GET", link2.String()), http.StatusOK)
102
+
resp = MakeRequest(t, NewRequest(t, "GET", link2.String()).AddTokenAuth(token), http.StatusOK)
108
103
bs, err = io.ReadAll(resp.Body)
109
104
assert.NoError(t, err)
110
105
var branch api.Branch
111
106
assert.NoError(t, json.Unmarshal(bs, &branch))
112
107
assert.EqualValues(t, "test_branch", branch.Name)
113
108
114
-
req := NewRequest(t, "POST", link.String())
109
+
req := NewRequest(t, "POST", link.String()).AddTokenAuth(token)
115
110
req.Header.Add("Content-Type", "application/json")
116
111
req.Body = io.NopCloser(bytes.NewBufferString(`{"new_branch_name":"test_branch2", "old_branch_name": "test_branch", "old_ref_name":"refs/heads/test_branch"}`))
117
112
resp = MakeRequest(t, req, http.StatusForbidden)
···
119
114
assert.NoError(t, err)
120
115
assert.EqualValues(t, "{\"message\":\"Git Repository is a mirror.\",\"url\":\""+setting.AppURL+"api/swagger\"}\n", string(bs))
121
116
122
-
resp = MakeRequest(t, NewRequest(t, "DELETE", link2.String()), http.StatusForbidden)
117
+
resp = MakeRequest(t, NewRequest(t, "DELETE", link2.String()).AddTokenAuth(token), http.StatusForbidden)
123
118
bs, err = io.ReadAll(resp.Body)
124
119
assert.NoError(t, err)
125
120
assert.EqualValues(t, "{\"message\":\"Git Repository is a mirror.\",\"url\":\""+setting.AppURL+"api/swagger\"}\n", string(bs))
+1
tests/mssql.ini.tmpl
+1
tests/mssql.ini.tmpl
···
100
100
INSTALL_LOCK = true
101
101
SECRET_KEY = 9pCviYTWSb
102
102
INTERNAL_TOKEN = eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJuYmYiOjE0OTU1NTE2MTh9.hhSVGOANkaKk3vfCd2jDOIww4pUk0xtg9JRde5UogyQ
103
+
DISABLE_QUERY_AUTH_TOKEN = true
103
104
104
105
[lfs]
105
106
PATH = tests/{{TEST_TYPE}}/gitea-{{TEST_TYPE}}-mssql/data/lfs
+1
tests/mysql.ini.tmpl
+1
tests/mysql.ini.tmpl
···
98
98
INSTALL_LOCK = true
99
99
SECRET_KEY = 9pCviYTWSb
100
100
INTERNAL_TOKEN = eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJuYmYiOjE0OTU1NTE2MTh9.hhSVGOANkaKk3vfCd2jDOIww4pUk0xtg9JRde5UogyQ
101
+
DISABLE_QUERY_AUTH_TOKEN = true
101
102
102
103
[lfs]
103
104
PATH = tests/{{TEST_TYPE}}/gitea-{{TEST_TYPE}}-mysql/data/lfs
+1
tests/pgsql.ini.tmpl
+1
tests/pgsql.ini.tmpl
+1
tests/sqlite.ini.tmpl
+1
tests/sqlite.ini.tmpl
···
97
97
INSTALL_LOCK = true
98
98
SECRET_KEY = 9pCviYTWSb
99
99
INTERNAL_TOKEN = eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJuYmYiOjE0OTI3OTU5ODN9.OQkH5UmzID2XBdwQ9TAI6Jj2t1X-wElVTjbE7aoN4I8
100
+
DISABLE_QUERY_AUTH_TOKEN = true
100
101
101
102
[oauth2]
102
103
JWT_SECRET = KZb_QLUd4fYVyxetjxC4eZkrBgWM2SndOOWDNtgUUko