mirror of
https://github.com/go-gitea/gitea
synced 2024-12-17 00:14:04 +01:00
daf2a4c047
There's a bug in #25715: If user pushed a commit into another repo with same branch name, the no-related repo will display the recently pushed notification incorrectly. It is simple to fix this, we should match the repo id in the sql query. ![image](https://github.com/go-gitea/gitea/assets/18380374/9411a926-16f1-419e-a1b5-e953af38bab1) The latest commit is 2 weeks ago. ![image](https://github.com/go-gitea/gitea/assets/18380374/52f9ab22-4999-43ac-a86f-6d36fb1e0411) The notification comes from another repo with same branch name: ![image](https://github.com/go-gitea/gitea/assets/18380374/a26bc335-8e5b-4b9c-a965-c3dc3fa6f252) After: In forked repo: ![image](https://github.com/go-gitea/gitea/assets/18380374/ce6ffc35-deb7-4be7-8b09-184207392f32) New PR Link will redirect to the original repo: ![image](https://github.com/go-gitea/gitea/assets/18380374/7b98e76f-0c75-494c-9462-80cf9f98e786) In the original repo: ![image](https://github.com/go-gitea/gitea/assets/18380374/5f6a821b-e51a-4bbd-9980-d9eb94a3c847) New PR Link: ![image](https://github.com/go-gitea/gitea/assets/18380374/1ce8c879-9f11-4312-8c32-695d7d9af0df) In the same repo: ![image](https://github.com/go-gitea/gitea/assets/18380374/64b56073-4d0e-40c4-b8a0-80be7a775f69) New PR Link: ![image](https://github.com/go-gitea/gitea/assets/18380374/96e1b6a3-fb98-40ee-b2ee-648039fb0dcf) 08/15 Update: Follow #26257, added permission check and logic fix mentioned in https://github.com/go-gitea/gitea/pull/26257#discussion_r1294085203 2024/04/25 Update: Fix #30611 --------- Co-authored-by: silverwind <me@silverwind.io> Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com> Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
154 lines
4.5 KiB
Go
154 lines
4.5 KiB
Go
// Copyright 2022 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package organization_test
|
|
|
|
import (
|
|
"fmt"
|
|
"testing"
|
|
|
|
"code.gitea.io/gitea/models/db"
|
|
"code.gitea.io/gitea/models/organization"
|
|
"code.gitea.io/gitea/models/unittest"
|
|
user_model "code.gitea.io/gitea/models/user"
|
|
"code.gitea.io/gitea/modules/setting"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
)
|
|
|
|
func TestUserIsPublicMember(t *testing.T) {
|
|
assert.NoError(t, unittest.PrepareTestDatabase())
|
|
|
|
tt := []struct {
|
|
uid int64
|
|
orgid int64
|
|
expected bool
|
|
}{
|
|
{2, 3, true},
|
|
{4, 3, false},
|
|
{5, 6, true},
|
|
{5, 7, false},
|
|
}
|
|
for _, v := range tt {
|
|
t.Run(fmt.Sprintf("UserId%dIsPublicMemberOf%d", v.uid, v.orgid), func(t *testing.T) {
|
|
testUserIsPublicMember(t, v.uid, v.orgid, v.expected)
|
|
})
|
|
}
|
|
}
|
|
|
|
func testUserIsPublicMember(t *testing.T, uid, orgID int64, expected bool) {
|
|
user, err := user_model.GetUserByID(db.DefaultContext, uid)
|
|
assert.NoError(t, err)
|
|
is, err := organization.IsPublicMembership(db.DefaultContext, orgID, user.ID)
|
|
assert.NoError(t, err)
|
|
assert.Equal(t, expected, is)
|
|
}
|
|
|
|
func TestIsUserOrgOwner(t *testing.T) {
|
|
assert.NoError(t, unittest.PrepareTestDatabase())
|
|
|
|
tt := []struct {
|
|
uid int64
|
|
orgid int64
|
|
expected bool
|
|
}{
|
|
{2, 3, true},
|
|
{4, 3, false},
|
|
{5, 6, true},
|
|
{5, 7, true},
|
|
}
|
|
for _, v := range tt {
|
|
t.Run(fmt.Sprintf("UserId%dIsOrgOwnerOf%d", v.uid, v.orgid), func(t *testing.T) {
|
|
testIsUserOrgOwner(t, v.uid, v.orgid, v.expected)
|
|
})
|
|
}
|
|
}
|
|
|
|
func testIsUserOrgOwner(t *testing.T, uid, orgID int64, expected bool) {
|
|
user, err := user_model.GetUserByID(db.DefaultContext, uid)
|
|
assert.NoError(t, err)
|
|
is, err := organization.IsOrganizationOwner(db.DefaultContext, orgID, user.ID)
|
|
assert.NoError(t, err)
|
|
assert.Equal(t, expected, is)
|
|
}
|
|
|
|
func TestUserListIsPublicMember(t *testing.T) {
|
|
assert.NoError(t, unittest.PrepareTestDatabase())
|
|
tt := []struct {
|
|
orgid int64
|
|
expected map[int64]bool
|
|
}{
|
|
{3, map[int64]bool{2: true, 4: false, 28: true}},
|
|
{6, map[int64]bool{5: true, 28: true}},
|
|
{7, map[int64]bool{5: false}},
|
|
{25, map[int64]bool{12: true, 24: true}},
|
|
{22, map[int64]bool{}},
|
|
}
|
|
for _, v := range tt {
|
|
t.Run(fmt.Sprintf("IsPublicMemberOfOrgId%d", v.orgid), func(t *testing.T) {
|
|
testUserListIsPublicMember(t, v.orgid, v.expected)
|
|
})
|
|
}
|
|
}
|
|
|
|
func testUserListIsPublicMember(t *testing.T, orgID int64, expected map[int64]bool) {
|
|
org, err := organization.GetOrgByID(db.DefaultContext, orgID)
|
|
assert.NoError(t, err)
|
|
_, membersIsPublic, err := org.GetMembers(db.DefaultContext)
|
|
assert.NoError(t, err)
|
|
assert.Equal(t, expected, membersIsPublic)
|
|
}
|
|
|
|
func TestUserListIsUserOrgOwner(t *testing.T) {
|
|
assert.NoError(t, unittest.PrepareTestDatabase())
|
|
tt := []struct {
|
|
orgid int64
|
|
expected map[int64]bool
|
|
}{
|
|
{3, map[int64]bool{2: true, 4: false, 28: false}},
|
|
{6, map[int64]bool{5: true, 28: false}},
|
|
{7, map[int64]bool{5: true}},
|
|
{25, map[int64]bool{12: true, 24: false}}, // ErrTeamNotExist
|
|
{22, map[int64]bool{}}, // No member
|
|
}
|
|
for _, v := range tt {
|
|
t.Run(fmt.Sprintf("IsUserOrgOwnerOfOrgId%d", v.orgid), func(t *testing.T) {
|
|
testUserListIsUserOrgOwner(t, v.orgid, v.expected)
|
|
})
|
|
}
|
|
}
|
|
|
|
func testUserListIsUserOrgOwner(t *testing.T, orgID int64, expected map[int64]bool) {
|
|
org, err := organization.GetOrgByID(db.DefaultContext, orgID)
|
|
assert.NoError(t, err)
|
|
members, _, err := org.GetMembers(db.DefaultContext)
|
|
assert.NoError(t, err)
|
|
assert.Equal(t, expected, organization.IsUserOrgOwner(db.DefaultContext, members, orgID))
|
|
}
|
|
|
|
func TestAddOrgUser(t *testing.T) {
|
|
assert.NoError(t, unittest.PrepareTestDatabase())
|
|
testSuccess := func(orgID, userID int64, isPublic bool) {
|
|
org := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: orgID})
|
|
expectedNumMembers := org.NumMembers
|
|
if !unittest.BeanExists(t, &organization.OrgUser{OrgID: orgID, UID: userID}) {
|
|
expectedNumMembers++
|
|
}
|
|
assert.NoError(t, organization.AddOrgUser(db.DefaultContext, orgID, userID))
|
|
ou := &organization.OrgUser{OrgID: orgID, UID: userID}
|
|
unittest.AssertExistsAndLoadBean(t, ou)
|
|
assert.Equal(t, isPublic, ou.IsPublic)
|
|
org = unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: orgID})
|
|
assert.EqualValues(t, expectedNumMembers, org.NumMembers)
|
|
}
|
|
|
|
setting.Service.DefaultOrgMemberVisible = false
|
|
testSuccess(3, 5, false)
|
|
testSuccess(3, 5, false)
|
|
testSuccess(6, 2, false)
|
|
|
|
setting.Service.DefaultOrgMemberVisible = true
|
|
testSuccess(6, 3, true)
|
|
|
|
unittest.CheckConsistencyFor(t, &user_model.User{}, &organization.Team{})
|
|
}
|