Usernames must start with a letter (#5581)

2 files changed, 9 insertions, 9 deletions

diff --git a/app/import_test.go b/app/import_test.go
index 165c94875..8867fbec1 100644
--- a/app/import_test.go
+++ b/app/import_test.go
@@ -837,7 +837,7 @@ func TestImportImportUser(t *testing.T) {
 
 	// Do an invalid user in dry-run mode.
 	data := UserImportData{
-		Username: ptrStr(model.NewId()),
+		Username: ptrStr("n" + model.NewId()),
 	}
 	if err := ImportUser(&data, true); err == nil {
 		t.Fatalf("Should have failed to import invalid user.")
@@ -854,7 +854,7 @@ func TestImportImportUser(t *testing.T) {
 
 	// Do a valid user in dry-run mode.
 	data = UserImportData{
-		Username: ptrStr(model.NewId()),
+		Username: ptrStr("n" + model.NewId()),
 		Email:    ptrStr(model.NewId() + "@example.com"),
 	}
 	if err := ImportUser(&data, true); err != nil {
@@ -888,7 +888,7 @@ func TestImportImportUser(t *testing.T) {
 	}
 
 	// Do a valid user in apply mode.
-	username := model.NewId()
+	username := "n" + model.NewId()
 	data = UserImportData{
 		Username:  &username,
 		Email:     ptrStr(model.NewId() + "@example.com"),
@@ -1023,7 +1023,7 @@ func TestImportImportUser(t *testing.T) {
 		t.Fatalf("Failed to get channel from database.")
 	}
 
-	username = model.NewId()
+	username = "n" + model.NewId()
 	data = UserImportData{
 		Username:  &username,
 		Email:     ptrStr(model.NewId() + "@example.com"),
@@ -1312,7 +1312,7 @@ func TestImportImportUser(t *testing.T) {
 	}
 
 	// Add a user with some preferences.
-	username = model.NewId()
+	username = "n" + model.NewId()
 	data = UserImportData{
 		Username:           &username,
 		Email:              ptrStr(model.NewId() + "@example.com"),
@@ -1476,7 +1476,7 @@ func TestImportImportPost(t *testing.T) {
 	}
 
 	// Create a user.
-	username := model.NewId()
+	username := "n" + model.NewId()
 	ImportUser(&UserImportData{
 		Username: &username,
 		Email:    ptrStr(model.NewId() + "@example.com"),
@@ -1724,7 +1724,7 @@ func TestImportBulkImport(t *testing.T) {
 
 	teamName := model.NewId()
 	channelName := model.NewId()
-	username := model.NewId()
+	username := "n" + model.NewId()
 
 	// Run bulk import with a valid 1 of everything.
 	data1 := `{"type": "version", "version": 1}
diff --git a/app/user_test.go b/app/user_test.go
index 8979af7d7..ec0e2b73c 100644
--- a/app/user_test.go
+++ b/app/user_test.go
@@ -5,9 +5,9 @@ package app
 
 import (
 	"bytes"
+	"encoding/json"
 	"image"
 	"image/color"
-	"encoding/json"
 	"math/rand"
 	"strings"
 	"testing"
@@ -67,7 +67,7 @@ func TestCheckUserDomain(t *testing.T) {
 func TestCreateOAuthUser(t *testing.T) {
 	th := Setup().InitBasic()
 	r := rand.New(rand.NewSource(time.Now().UnixNano()))
-	glUser := oauthgitlab.GitLabUser{Id: int64(r.Intn(1000)), Username: model.NewId(), Email: model.NewId() + "@simulator.amazonses.com", Name: "Joram Wilander"}
+	glUser := oauthgitlab.GitLabUser{Id: int64(r.Intn(1000)), Username: "joram" + model.NewId(), Email: model.NewId() + "@simulator.amazonses.com", Name: "Joram Wilander"}
 
 	json := glUser.ToJson()
 	user, err := CreateOAuthUser(model.USER_AUTH_SERVICE_GITLAB, strings.NewReader(json), th.BasicTeam.Id)