Merge branch 'rebase-forgejo-dependency' into forgejo

This commit is contained in:
Earl Warren 2024-01-15 18:28:22 +00:00
commit e165ff8886
No known key found for this signature in database
GPG key ID: 0579CB2928A78A00
221 changed files with 7000 additions and 622 deletions

View file

@ -533,6 +533,16 @@ func TestIsUserVisibleToViewer(t *testing.T) {
test(user31, nil, false)
}
func TestGetAllAdmins(t *testing.T) {
assert.NoError(t, unittest.PrepareTestDatabase())
admins, err := user_model.GetAllAdmins(db.DefaultContext)
assert.NoError(t, err)
assert.Len(t, admins, 1)
assert.Equal(t, int64(1), admins[0].ID)
}
func Test_ValidateUser(t *testing.T) {
oldSetting := setting.Service.AllowedUserVisibilityModesSlice
defer func() {
@ -552,6 +562,11 @@ func Test_ValidateUser(t *testing.T) {
}
func Test_NormalizeUserFromEmail(t *testing.T) {
oldSetting := setting.Service.AllowDotsInUsernames
defer func() {
setting.Service.AllowDotsInUsernames = oldSetting
}()
setting.Service.AllowDotsInUsernames = true
testCases := []struct {
Input string
Expected string