From da5a0b8382c4b5c9913fa02d0a801e543e5a0699 Mon Sep 17 00:00:00 2001
From: Lunny Xiao <xiaolunwen@gmail.com>
Date: Sun, 9 Dec 2018 10:19:50 +0800
Subject: [PATCH] add tests for api user orgs (#5494)
* add tests for api user orgs
* add permission for admin to list user's orgs even he is a private user of org
---
integrations/api_user_orgs_test.go | 63 ++++++++++++++++++++++++++++++
routers/api/v1/org/org.go | 2 +-
2 files changed, 64 insertions(+), 1 deletion(-)
create mode 100644 integrations/api_user_orgs_test.go
diff --git a/integrations/api_user_orgs_test.go b/integrations/api_user_orgs_test.go
new file mode 100644
index 000000000..f8372d611
--- /dev/null
+++ b/integrations/api_user_orgs_test.go
@@ -0,0 +1,63 @@
+// Copyright 2018 The Gitea Authors. All rights reserved.
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.package models
+
+package integrations
+
+import (
+ "fmt"
+ "net/http"
+ "testing"
+
+ api "code.gitea.io/sdk/gitea"
+ "github.com/stretchr/testify/assert"
+)
+
+func TestUserOrgs(t *testing.T) {
+ prepareTestEnv(t)
+ adminUsername := "user1"
+ normalUsername := "user2"
+ session := loginUser(t, adminUsername)
+ token := getTokenForLoggedInUser(t, session)
+ urlStr := fmt.Sprintf("/api/v1/users/%s/orgs?token=%s", normalUsername, token)
+ req := NewRequest(t, "GET", urlStr)
+ resp := session.MakeRequest(t, req, http.StatusOK)
+ var orgs []*api.Organization
+ DecodeJSON(t, resp, &orgs)
+
+ assert.Equal(t, []*api.Organization{
+ {
+ ID: 3,
+ UserName: "user3",
+ FullName: "User Three",
+ AvatarURL: "https://secure.gravatar.com/avatar/97d6d9441ff85fdc730e02a6068d267b?d=identicon",
+ Description: "",
+ Website: "",
+ Location: "",
+ },
+ }, orgs)
+}
+
+func TestMyOrgs(t *testing.T) {
+ prepareTestEnv(t)
+
+ normalUsername := "user2"
+ session := loginUser(t, normalUsername)
+ token := getTokenForLoggedInUser(t, session)
+ req := NewRequest(t, "GET", "/api/v1/user/orgs?token="+token)
+ resp := session.MakeRequest(t, req, http.StatusOK)
+ var orgs []*api.Organization
+ DecodeJSON(t, resp, &orgs)
+
+ assert.Equal(t, []*api.Organization{
+ {
+ ID: 3,
+ UserName: "user3",
+ FullName: "User Three",
+ AvatarURL: "https://secure.gravatar.com/avatar/97d6d9441ff85fdc730e02a6068d267b?d=identicon",
+ Description: "",
+ Website: "",
+ Location: "",
+ },
+ }, orgs)
+}
diff --git a/routers/api/v1/org/org.go b/routers/api/v1/org/org.go
index 93c2ed7a8..c300c2814 100644
--- a/routers/api/v1/org/org.go
+++ b/routers/api/v1/org/org.go
@@ -60,7 +60,7 @@ func ListUserOrgs(ctx *context.APIContext) {
if ctx.Written() {
return
}
- listUserOrgs(ctx, u, false)
+ listUserOrgs(ctx, u, ctx.User.IsAdmin)
}
// Create api for create organization