@@ -50,17 +50,17 @@ func TestAdminUserCreate(t *testing.T) {
5050 assert .Equal (t , check {IsAdmin : false , MustChangePassword : false }, createCheck ("u5" , "--must-change-password=false" ))
5151 })
5252
53- createUser := func (name , args string ) error {
54- return app .Run (strings . Fields ( fmt . Sprintf ( "./gitea admin user create --username %s --email %s @gitea.local %s" , name , name , args ) ))
53+ createUser := func (name string , args ... string ) error {
54+ return app .Run (append ([] string { "./gitea" , " admin" , " user" , " create" , " --username" , name , " --email" , name + " @gitea.local" }, args ... ))
5555 }
5656
5757 t .Run ("UserType" , func (t * testing.T ) {
5858 reset ()
59- assert .ErrorContains (t , createUser ("u" , "--user-type invalid" ), "invalid user type" )
60- assert .ErrorContains (t , createUser ("u" , "--user-type bot --password 123" ), "can only be set for individual users" )
61- assert .ErrorContains (t , createUser ("u" , "--user-type bot --must-change-password" ), "can only be set for individual users" )
59+ assert .ErrorContains (t , createUser ("u" , "--user-type" , " invalid" ), "invalid user type" )
60+ assert .ErrorContains (t , createUser ("u" , "--user-type" , " bot" , " --password" , " 123" ), "can only be set for individual users" )
61+ assert .ErrorContains (t , createUser ("u" , "--user-type" , " bot" , " --must-change-password" ), "can only be set for individual users" )
6262
63- assert .NoError (t , createUser ("u" , "--user-type bot" ))
63+ assert .NoError (t , createUser ("u" , "--user-type" , " bot" ))
6464 u := unittest .AssertExistsAndLoadBean (t , & user_model.User {LowerName : "u" })
6565 assert .Equal (t , user_model .UserTypeBot , u .Type )
6666 assert .Empty (t , u .Passwd )
@@ -75,7 +75,7 @@ func TestAdminUserCreate(t *testing.T) {
7575
7676 // using "--access-token" only means "all" access
7777 reset ()
78- assert .NoError (t , createUser ("u" , "--random-password --access-token" ))
78+ assert .NoError (t , createUser ("u" , "--random-password" , " --access-token" ))
7979 assert .Equal (t , 1 , unittest .GetCount (t , & user_model.User {}))
8080 assert .Equal (t , 1 , unittest .GetCount (t , & auth_model.AccessToken {}))
8181 accessToken := unittest .AssertExistsAndLoadBean (t , & auth_model.AccessToken {Name : "gitea-admin" })
@@ -85,7 +85,7 @@ func TestAdminUserCreate(t *testing.T) {
8585
8686 // using "--access-token" with name & scopes
8787 reset ()
88- assert .NoError (t , createUser ("u" , "--random-password --access-token --access-token-name new-token-name --access-token-scopes read:issue,read:user" ))
88+ assert .NoError (t , createUser ("u" , "--random-password" , " --access-token" , " --access-token-name" , " new-token-name" , " --access-token-scopes" , " read:issue,read:user" ))
8989 assert .Equal (t , 1 , unittest .GetCount (t , & user_model.User {}))
9090 assert .Equal (t , 1 , unittest .GetCount (t , & auth_model.AccessToken {}))
9191 accessToken = unittest .AssertExistsAndLoadBean (t , & auth_model.AccessToken {Name : "new-token-name" })
@@ -98,23 +98,38 @@ func TestAdminUserCreate(t *testing.T) {
9898
9999 // using "--access-token-name" without "--access-token"
100100 reset ()
101- err = createUser ("u" , "--random-password --access-token-name new-token-name" )
101+ err = createUser ("u" , "--random-password" , " --access-token-name" , " new-token-name" )
102102 assert .Equal (t , 0 , unittest .GetCount (t , & user_model.User {}))
103103 assert .Equal (t , 0 , unittest .GetCount (t , & auth_model.AccessToken {}))
104104 assert .ErrorContains (t , err , "access-token-name and access-token-scopes flags are only valid when access-token flag is set" )
105105
106106 // using "--access-token-scopes" without "--access-token"
107107 reset ()
108- err = createUser ("u" , "--random-password --access-token-scopes read:issue" )
108+ err = createUser ("u" , "--random-password" , " --access-token-scopes" , " read:issue" )
109109 assert .Equal (t , 0 , unittest .GetCount (t , & user_model.User {}))
110110 assert .Equal (t , 0 , unittest .GetCount (t , & auth_model.AccessToken {}))
111111 assert .ErrorContains (t , err , "access-token-name and access-token-scopes flags are only valid when access-token flag is set" )
112112
113113 // empty permission
114114 reset ()
115- err = createUser ("u" , "--random-password --access-token --access-token-scopes public-only" )
115+ err = createUser ("u" , "--random-password" , " --access-token" , " --access-token-scopes" , " public-only" )
116116 assert .Equal (t , 0 , unittest .GetCount (t , & user_model.User {}))
117117 assert .Equal (t , 0 , unittest .GetCount (t , & auth_model.AccessToken {}))
118118 assert .ErrorContains (t , err , "access token does not have any permission" )
119119 })
120+
121+ t .Run ("UserFields" , func (t * testing.T ) {
122+ reset ()
123+ assert .NoError (t , createUser ("u-FullNameWithSpace" , "--random-password" , "--fullname" , "First O'Middle Last" ))
124+ unittest .AssertExistsAndLoadBean (t , & user_model.User {
125+ Name : "u-FullNameWithSpace" ,
126+ LowerName : "u-fullnamewithspace" ,
127+ FullName : "First O'Middle Last" ,
128+ Email : "u-FullNameWithSpace@gitea.local" ,
129+ })
130+
131+ assert .NoError (t , createUser ("u-FullNameEmpty" , "--random-password" , "--fullname" , "" ))
132+ u := unittest .AssertExistsAndLoadBean (t , & user_model.User {LowerName : "u-fullnameempty" })
133+ assert .Empty (t , u .FullName )
134+ })
120135}
0 commit comments