@@ -5,6 +5,7 @@ package integration
55
66import  (
77	"net/http" 
8+ 	"strings" 
89	"testing" 
910
1011	auth_model "code.gitea.io/gitea/models/auth" 
@@ -102,8 +103,8 @@ func TestRenameReservedUsername(t *testing.T) {
102103	}
103104
104105	session  :=  loginUser (t , "user2" )
106+ 	locale  :=  translation .NewLocale ("en-US" )
105107	for  _ , reservedUsername  :=  range  reservedUsernames  {
106- 		t .Logf ("Testing username %s" , reservedUsername )
107108		req  :=  NewRequestWithValues (t , "POST" , "/user/settings" , map [string ]string {
108109			"_csrf" :    GetUserCSRFToken (t , session ),
109110			"name" :     reservedUsername ,
@@ -115,11 +116,12 @@ func TestRenameReservedUsername(t *testing.T) {
115116		req  =  NewRequest (t , "GET" , test .RedirectURL (resp ))
116117		resp  =  session .MakeRequest (t , req , http .StatusOK )
117118		htmlDoc  :=  NewHTMLParser (t , resp .Body )
118- 		assert .Contains (t ,
119- 			htmlDoc .doc .Find (".ui.negative.message" ).Text (),
120- 			translation .NewLocale ("en-US" ).TrString ("user.form.name_reserved" , reservedUsername ),
121- 		)
122- 
119+ 		actualMsg  :=  strings .TrimSpace (htmlDoc .doc .Find (".ui.negative.message" ).Text ())
120+ 		expectedMsg  :=  locale .TrString ("user.form.name_reserved" , reservedUsername )
121+ 		if  strings .Contains (reservedUsername , "." ) {
122+ 			expectedMsg  =  locale .TrString ("user.form.name_pattern_not_allowed" , reservedUsername )
123+ 		}
124+ 		assert .Equal (t , expectedMsg , actualMsg )
123125		unittest .AssertNotExistsBean (t , & user_model.User {Name : reservedUsername })
124126	}
125127}
0 commit comments