diff options
Diffstat (limited to 'tests/integration/api_user_orgs_test.go')
| -rw-r--r-- | tests/integration/api_user_orgs_test.go | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/tests/integration/api_user_orgs_test.go b/tests/integration/api_user_orgs_test.go index f29014e934..1f9ee2ea6e 100644 --- a/tests/integration/api_user_orgs_test.go +++ b/tests/integration/api_user_orgs_test.go @@ -68,14 +68,12 @@ func TestUserOrgs(t *testing.T) { func getUserOrgs(t *testing.T, userDoer, userCheck string) (orgs []*api.Organization) { token := "" - session := emptyTestSession(t) if len(userDoer) != 0 { - session = loginUser(t, userDoer) - token = getTokenForLoggedInUser(t, session) + token = getUserToken(t, userDoer) } urlStr := fmt.Sprintf("/api/v1/users/%s/orgs?token=%s", userCheck, token) req := NewRequest(t, "GET", urlStr) - resp := session.MakeRequest(t, req, http.StatusOK) + resp := MakeRequest(t, req, http.StatusOK) DecodeJSON(t, resp, &orgs) return orgs } @@ -83,15 +81,13 @@ func getUserOrgs(t *testing.T, userDoer, userCheck string) (orgs []*api.Organiza func TestMyOrgs(t *testing.T) { defer tests.PrepareTestEnv(t)() - session := emptyTestSession(t) req := NewRequest(t, "GET", "/api/v1/user/orgs") - session.MakeRequest(t, req, http.StatusUnauthorized) + MakeRequest(t, req, http.StatusUnauthorized) normalUsername := "user2" - session = loginUser(t, normalUsername) - token := getTokenForLoggedInUser(t, session) + token := getUserToken(t, normalUsername) req = NewRequest(t, "GET", "/api/v1/user/orgs?token="+token) - resp := session.MakeRequest(t, req, http.StatusOK) + resp := MakeRequest(t, req, http.StatusOK) var orgs []*api.Organization DecodeJSON(t, resp, &orgs) user3 := unittest.AssertExistsAndLoadBean(t, &user_model.User{Name: "user3"}) |