Skip to content

Commit df676a4

Browse files
lunnylunny
authored
Remove session in api tests (#21984)
It's no meaning to request an API route with session.
1 parent 665d02e commit df676a4

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+387
-433
lines changed

‎tests/integration/api_admin_org_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ func TestAPIAdminOrgCreate(t *testing.T) {
3131
Visibility: "private",
3232
}
3333
req := NewRequestWithJSON(t, "POST", "/api/v1/admin/users/user2/orgs?token="+token, &org)
34-
resp := session.MakeRequest(t, req, http.StatusCreated)
34+
resp := MakeRequest(t, req, http.StatusCreated)
3535

3636
var apiOrg api.Organization
3737
DecodeJSON(t, resp, &apiOrg)
@@ -65,7 +65,7 @@ func TestAPIAdminOrgCreateBadVisibility(t *testing.T) {
6565
Visibility: "notvalid",
6666
}
6767
req := NewRequestWithJSON(t, "POST", "/api/v1/admin/users/user2/orgs?token="+token, &org)
68-
session.MakeRequest(t, req, http.StatusUnprocessableEntity)
68+
MakeRequest(t, req, http.StatusUnprocessableEntity)
6969
})
7070
}
7171

@@ -83,5 +83,5 @@ func TestAPIAdminOrgCreateNotAdmin(t *testing.T) {
8383
Visibility: "public",
8484
}
8585
req := NewRequestWithJSON(t, "POST", "/api/v1/admin/users/user2/orgs?token="+token, &org)
86-
session.MakeRequest(t, req, http.StatusForbidden)
86+
MakeRequest(t, req, http.StatusForbidden)
8787
}

‎tests/integration/api_admin_test.go

+25-37
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ func TestAPIAdminCreateAndDeleteSSHKey(t *testing.T) {
3030
"key": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC4cn+iXnA4KvcQYSV88vGn0Yi91vG47t1P7okprVmhNTkipNRIHWr6WdCO4VDr/cvsRkuVJAsLO2enwjGWWueOO6BodiBgyAOZ/5t5nJNMCNuLGT5UIo/RI1b0WRQwxEZTRjt6mFNw6lH14wRd8ulsr9toSWBPMOGWoYs1PDeDL0JuTjL+tr1SZi/EyxCngpYszKdXllJEHyI79KQgeD0Vt3pTrkbNVTOEcCNqZePSVmUH8X8Vhugz3bnE0/iE9Pb5fkWO9c4AnM1FgI/8Bvp27Fw2ShryIXuR6kKvUqhVMTuOSDHwu6A8jLE5Owt3GAYugDpDYuwTVNGrHLXKpPzrGGPE/jPmaLCMZcsdkec95dYeU3zKODEm8UQZFhmJmDeWVJ36nGrGZHL4J5aTTaeFUJmmXDaJYiJ+K2/ioKgXqnXvltu0A9R8/LGy4nrTJRr4JMLuJFoUXvGm1gXQ70w2LSpk6yl71RNC0hCtsBe8BP8IhYCM0EP5jh7eCMQZNvM= nocomment\n",
3131
"title": "test-key",
3232
})
33-
resp := session.MakeRequest(t, req, http.StatusCreated)
33+
resp := MakeRequest(t, req, http.StatusCreated)
3434

3535
var newPublicKey api.PublicKey
3636
DecodeJSON(t, resp, &newPublicKey)
@@ -43,53 +43,49 @@ func TestAPIAdminCreateAndDeleteSSHKey(t *testing.T) {
4343

4444
req = NewRequestf(t, "DELETE", "/api/v1/admin/users/%s/keys/%d?token=%s",
4545
keyOwner.Name, newPublicKey.ID, token)
46-
session.MakeRequest(t, req, http.StatusNoContent)
46+
MakeRequest(t, req, http.StatusNoContent)
4747
unittest.AssertNotExistsBean(t, &asymkey_model.PublicKey{ID: newPublicKey.ID})
4848
}
4949

5050
func TestAPIAdminDeleteMissingSSHKey(t *testing.T) {
5151
defer tests.PrepareTestEnv(t)()
52-
// user1 is an admin user
53-
session := loginUser(t, "user1")
5452

55-
token := getTokenForLoggedInUser(t, session)
53+
// user1 is an admin user
54+
token := getUserToken(t, "user1")
5655
req := NewRequestf(t, "DELETE", "/api/v1/admin/users/user1/keys/%d?token=%s", unittest.NonexistentID, token)
57-
session.MakeRequest(t, req, http.StatusNotFound)
56+
MakeRequest(t, req, http.StatusNotFound)
5857
}
5958

6059
func TestAPIAdminDeleteUnauthorizedKey(t *testing.T) {
6160
defer tests.PrepareTestEnv(t)()
6261
adminUsername := "user1"
6362
normalUsername := "user2"
64-
session := loginUser(t, adminUsername)
63+
token := getUserToken(t, adminUsername)
6564

66-
token := getTokenForLoggedInUser(t, session)
6765
urlStr := fmt.Sprintf("/api/v1/admin/users/%s/keys?token=%s", adminUsername, token)
6866
req := NewRequestWithValues(t, "POST", urlStr, map[string]string{
6967
"key": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC4cn+iXnA4KvcQYSV88vGn0Yi91vG47t1P7okprVmhNTkipNRIHWr6WdCO4VDr/cvsRkuVJAsLO2enwjGWWueOO6BodiBgyAOZ/5t5nJNMCNuLGT5UIo/RI1b0WRQwxEZTRjt6mFNw6lH14wRd8ulsr9toSWBPMOGWoYs1PDeDL0JuTjL+tr1SZi/EyxCngpYszKdXllJEHyI79KQgeD0Vt3pTrkbNVTOEcCNqZePSVmUH8X8Vhugz3bnE0/iE9Pb5fkWO9c4AnM1FgI/8Bvp27Fw2ShryIXuR6kKvUqhVMTuOSDHwu6A8jLE5Owt3GAYugDpDYuwTVNGrHLXKpPzrGGPE/jPmaLCMZcsdkec95dYeU3zKODEm8UQZFhmJmDeWVJ36nGrGZHL4J5aTTaeFUJmmXDaJYiJ+K2/ioKgXqnXvltu0A9R8/LGy4nrTJRr4JMLuJFoUXvGm1gXQ70w2LSpk6yl71RNC0hCtsBe8BP8IhYCM0EP5jh7eCMQZNvM= nocomment\n",
7068
"title": "test-key",
7169
})
72-
resp := session.MakeRequest(t, req, http.StatusCreated)
70+
resp := MakeRequest(t, req, http.StatusCreated)
7371
var newPublicKey api.PublicKey
7472
DecodeJSON(t, resp, &newPublicKey)
7573

76-
session = loginUser(t, normalUsername)
77-
token = getTokenForLoggedInUser(t, session)
74+
token = getUserToken(t, normalUsername)
7875
req = NewRequestf(t, "DELETE", "/api/v1/admin/users/%s/keys/%d?token=%s",
7976
adminUsername, newPublicKey.ID, token)
80-
session.MakeRequest(t, req, http.StatusForbidden)
77+
MakeRequest(t, req, http.StatusForbidden)
8178
}
8279

8380
func TestAPISudoUser(t *testing.T) {
8481
defer tests.PrepareTestEnv(t)()
8582
adminUsername := "user1"
8683
normalUsername := "user2"
87-
session := loginUser(t, adminUsername)
88-
token := getTokenForLoggedInUser(t, session)
84+
token := getUserToken(t, adminUsername)
8985

9086
urlStr := fmt.Sprintf("/api/v1/user?sudo=%s&token=%s", normalUsername, token)
9187
req := NewRequest(t, "GET", urlStr)
92-
resp := session.MakeRequest(t, req, http.StatusOK)
88+
resp := MakeRequest(t, req, http.StatusOK)
9389
var user api.User
9490
DecodeJSON(t, resp, &user)
9591

@@ -101,23 +97,20 @@ func TestAPISudoUserForbidden(t *testing.T) {
10197
adminUsername := "user1"
10298
normalUsername := "user2"
10399

104-
session := loginUser(t, normalUsername)
105-
token := getTokenForLoggedInUser(t, session)
106-
100+
token := getUserToken(t, normalUsername)
107101
urlStr := fmt.Sprintf("/api/v1/user?sudo=%s&token=%s", adminUsername, token)
108102
req := NewRequest(t, "GET", urlStr)
109-
session.MakeRequest(t, req, http.StatusForbidden)
103+
MakeRequest(t, req, http.StatusForbidden)
110104
}
111105

112106
func TestAPIListUsers(t *testing.T) {
113107
defer tests.PrepareTestEnv(t)()
114108
adminUsername := "user1"
115-
session := loginUser(t, adminUsername)
116-
token := getTokenForLoggedInUser(t, session)
109+
token := getUserToken(t, adminUsername)
117110

118111
urlStr := fmt.Sprintf("/api/v1/admin/users?token=%s", token)
119112
req := NewRequest(t, "GET", urlStr)
120-
resp := session.MakeRequest(t, req, http.StatusOK)
113+
resp := MakeRequest(t, req, http.StatusOK)
121114
var users []api.User
122115
DecodeJSON(t, resp, &users)
123116

@@ -141,17 +134,15 @@ func TestAPIListUsersNotLoggedIn(t *testing.T) {
141134
func TestAPIListUsersNonAdmin(t *testing.T) {
142135
defer tests.PrepareTestEnv(t)()
143136
nonAdminUsername := "user2"
144-
session := loginUser(t, nonAdminUsername)
145-
token := getTokenForLoggedInUser(t, session)
137+
token := getUserToken(t, nonAdminUsername)
146138
req := NewRequestf(t, "GET", "/api/v1/admin/users?token=%s", token)
147-
session.MakeRequest(t, req, http.StatusForbidden)
139+
MakeRequest(t, req, http.StatusForbidden)
148140
}
149141

150142
func TestAPICreateUserInvalidEmail(t *testing.T) {
151143
defer tests.PrepareTestEnv(t)()
152144
adminUsername := "user1"
153-
session := loginUser(t, adminUsername)
154-
token := getTokenForLoggedInUser(t, session)
145+
token := getUserToken(t, adminUsername)
155146
urlStr := fmt.Sprintf("/api/v1/admin/users?token=%s", token)
156147
req := NewRequestWithValues(t, "POST", urlStr, map[string]string{
157148
"email": "invalid_email@domain.com\r\n",
@@ -163,14 +154,13 @@ func TestAPICreateUserInvalidEmail(t *testing.T) {
163154
"source_id": "0",
164155
"username": "invalidUser",
165156
})
166-
session.MakeRequest(t, req, http.StatusUnprocessableEntity)
157+
MakeRequest(t, req, http.StatusUnprocessableEntity)
167158
}
168159

169160
func TestAPICreateAndDeleteUser(t *testing.T) {
170161
defer tests.PrepareTestEnv(t)()
171162
adminUsername := "user1"
172-
session := loginUser(t, adminUsername)
173-
token := getTokenForLoggedInUser(t, session)
163+
token := getUserToken(t, adminUsername)
174164

175165
req := NewRequestWithValues(
176166
t,
@@ -196,8 +186,7 @@ func TestAPICreateAndDeleteUser(t *testing.T) {
196186
func TestAPIEditUser(t *testing.T) {
197187
defer tests.PrepareTestEnv(t)()
198188
adminUsername := "user1"
199-
session := loginUser(t, adminUsername)
200-
token := getTokenForLoggedInUser(t, session)
189+
token := getUserToken(t, adminUsername)
201190
urlStr := fmt.Sprintf("/api/v1/admin/users/%s?token=%s", "user2", token)
202191

203192
req := NewRequestWithValues(t, "PATCH", urlStr, map[string]string{
@@ -207,15 +196,15 @@ func TestAPIEditUser(t *testing.T) {
207196
// to change
208197
"full_name": "Full Name User 2",
209198
})
210-
session.MakeRequest(t, req, http.StatusOK)
199+
MakeRequest(t, req, http.StatusOK)
211200

212201
empty := ""
213202
req = NewRequestWithJSON(t, "PATCH", urlStr, api.EditUserOption{
214203
LoginName: "user2",
215204
SourceID: 0,
216205
Email: &empty,
217206
})
218-
resp := session.MakeRequest(t, req, http.StatusUnprocessableEntity)
207+
resp := MakeRequest(t, req, http.StatusUnprocessableEntity)
219208

220209
errMap := make(map[string]interface{})
221210
json.Unmarshal(resp.Body.Bytes(), &errMap)
@@ -231,16 +220,15 @@ func TestAPIEditUser(t *testing.T) {
231220
// to change
232221
Restricted: &bTrue,
233222
})
234-
session.MakeRequest(t, req, http.StatusOK)
223+
MakeRequest(t, req, http.StatusOK)
235224
user2 = unittest.AssertExistsAndLoadBean(t, &user_model.User{LoginName: "user2"})
236225
assert.True(t, user2.IsRestricted)
237226
}
238227

239228
func TestAPICreateRepoForUser(t *testing.T) {
240229
defer tests.PrepareTestEnv(t)()
241230
adminUsername := "user1"
242-
session := loginUser(t, adminUsername)
243-
token := getTokenForLoggedInUser(t, session)
231+
token := getUserToken(t, adminUsername)
244232

245233
req := NewRequestWithJSON(
246234
t,

‎tests/integration/api_branch_test.go

+13-19
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,9 @@ import (
1515
)
1616

1717
func testAPIGetBranch(t *testing.T, branchName string, exists bool) {
18-
session := loginUser(t, "user2")
19-
token := getTokenForLoggedInUser(t, session)
18+
token := getUserToken(t, "user2")
2019
req := NewRequestf(t, "GET", "/api/v1/repos/user2/repo1/branches/%s?token=%s", branchName, token)
21-
resp := session.MakeRequest(t, req, NoExpectedStatus)
20+
resp := MakeRequest(t, req, NoExpectedStatus)
2221
if !exists {
2322
assert.EqualValues(t, http.StatusNotFound, resp.Code)
2423
return
@@ -32,10 +31,9 @@ func testAPIGetBranch(t *testing.T, branchName string, exists bool) {
3231
}
3332

3433
func testAPIGetBranchProtection(t *testing.T, branchName string, expectedHTTPStatus int) {
35-
session := loginUser(t, "user2")
36-
token := getTokenForLoggedInUser(t, session)
34+
token := getUserToken(t, "user2")
3735
req := NewRequestf(t, "GET", "/api/v1/repos/user2/repo1/branch_protections/%s?token=%s", branchName, token)
38-
resp := session.MakeRequest(t, req, expectedHTTPStatus)
36+
resp := MakeRequest(t, req, expectedHTTPStatus)
3937

4038
if resp.Code == http.StatusOK {
4139
var branchProtection api.BranchProtection
@@ -45,12 +43,11 @@ func testAPIGetBranchProtection(t *testing.T, branchName string, expectedHTTPSta
4543
}
4644

4745
func testAPICreateBranchProtection(t *testing.T, branchName string, expectedHTTPStatus int) {
48-
session := loginUser(t, "user2")
49-
token := getTokenForLoggedInUser(t, session)
46+
token := getUserToken(t, "user2")
5047
req := NewRequestWithJSON(t, "POST", "/api/v1/repos/user2/repo1/branch_protections?token="+token, &api.BranchProtection{
5148
BranchName: branchName,
5249
})
53-
resp := session.MakeRequest(t, req, expectedHTTPStatus)
50+
resp := MakeRequest(t, req, expectedHTTPStatus)
5451

5552
if resp.Code == http.StatusCreated {
5653
var branchProtection api.BranchProtection
@@ -60,10 +57,9 @@ func testAPICreateBranchProtection(t *testing.T, branchName string, expectedHTTP
6057
}
6158

6259
func testAPIEditBranchProtection(t *testing.T, branchName string, body *api.BranchProtection, expectedHTTPStatus int) {
63-
session := loginUser(t, "user2")
64-
token := getTokenForLoggedInUser(t, session)
60+
token := getUserToken(t, "user2")
6561
req := NewRequestWithJSON(t, "PATCH", "/api/v1/repos/user2/repo1/branch_protections/"+branchName+"?token="+token, body)
66-
resp := session.MakeRequest(t, req, expectedHTTPStatus)
62+
resp := MakeRequest(t, req, expectedHTTPStatus)
6763

6864
if resp.Code == http.StatusOK {
6965
var branchProtection api.BranchProtection
@@ -73,17 +69,15 @@ func testAPIEditBranchProtection(t *testing.T, branchName string, body *api.Bran
7369
}
7470

7571
func testAPIDeleteBranchProtection(t *testing.T, branchName string, expectedHTTPStatus int) {
76-
session := loginUser(t, "user2")
77-
token := getTokenForLoggedInUser(t, session)
72+
token := getUserToken(t, "user2")
7873
req := NewRequestf(t, "DELETE", "/api/v1/repos/user2/repo1/branch_protections/%s?token=%s", branchName, token)
79-
session.MakeRequest(t, req, expectedHTTPStatus)
74+
MakeRequest(t, req, expectedHTTPStatus)
8075
}
8176

8277
func testAPIDeleteBranch(t *testing.T, branchName string, expectedHTTPStatus int) {
83-
session := loginUser(t, "user2")
84-
token := getTokenForLoggedInUser(t, session)
78+
token := getUserToken(t, "user2")
8579
req := NewRequestf(t, "DELETE", "/api/v1/repos/user2/repo1/branches/%s?token=%s", branchName, token)
86-
session.MakeRequest(t, req, expectedHTTPStatus)
80+
MakeRequest(t, req, expectedHTTPStatus)
8781
}
8882

8983
func TestAPIGetBranch(t *testing.T) {
@@ -160,7 +154,7 @@ func testAPICreateBranch(t testing.TB, session *TestSession, user, repo, oldBran
160154
BranchName: newBranch,
161155
OldBranchName: oldBranch,
162156
})
163-
resp := session.MakeRequest(t, req, status)
157+
resp := MakeRequest(t, req, status)
164158

165159
var branch api.Branch
166160
DecodeJSON(t, resp, &branch)

0 commit comments

Comments
 (0)