diff options
author | Christopher Speller <crspeller@gmail.com> | 2017-04-18 17:37:25 -0400 |
---|---|---|
committer | Christopher Speller <crspeller@gmail.com> | 2017-04-18 17:37:25 -0400 |
commit | 5398c82e1b80c3160974e01afabbfd1c2a2420a7 (patch) | |
tree | 74c9e48dcfe1c49b8225becb0daf4817d46f4edb /app | |
parent | 86c7e7cacd0608648ac65ff32d21b948c7527715 (diff) | |
download | chat-5398c82e1b80c3160974e01afabbfd1c2a2420a7.tar.gz chat-5398c82e1b80c3160974e01afabbfd1c2a2420a7.tar.bz2 chat-5398c82e1b80c3160974e01afabbfd1c2a2420a7.zip |
Revert "Usernames must start with a letter (#5581)"
This reverts commit 2e911b77c3386833f8f0cea82c7b6b3e5583a08e.
Diffstat (limited to 'app')
-rw-r--r-- | app/import_test.go | 14 | ||||
-rw-r--r-- | app/user_test.go | 4 |
2 files changed, 9 insertions, 9 deletions
diff --git a/app/import_test.go b/app/import_test.go index 847864977..5895314a3 100644 --- a/app/import_test.go +++ b/app/import_test.go @@ -851,7 +851,7 @@ func TestImportImportUser(t *testing.T) { // Do an invalid user in dry-run mode. data := UserImportData{ - Username: ptrStr("n" + model.NewId()), + Username: ptrStr(model.NewId()), } if err := ImportUser(&data, true); err == nil { t.Fatalf("Should have failed to import invalid user.") @@ -868,7 +868,7 @@ func TestImportImportUser(t *testing.T) { // Do a valid user in dry-run mode. data = UserImportData{ - Username: ptrStr("n" + model.NewId()), + Username: ptrStr(model.NewId()), Email: ptrStr(model.NewId() + "@example.com"), } if err := ImportUser(&data, true); err != nil { @@ -902,7 +902,7 @@ func TestImportImportUser(t *testing.T) { } // Do a valid user in apply mode. - username := "n" + model.NewId() + username := model.NewId() data = UserImportData{ Username: &username, Email: ptrStr(model.NewId() + "@example.com"), @@ -1037,7 +1037,7 @@ func TestImportImportUser(t *testing.T) { t.Fatalf("Failed to get channel from database.") } - username = "n" + model.NewId() + username = model.NewId() data = UserImportData{ Username: &username, Email: ptrStr(model.NewId() + "@example.com"), @@ -1326,7 +1326,7 @@ func TestImportImportUser(t *testing.T) { } // Add a user with some preferences. - username = "n" + model.NewId() + username = model.NewId() data = UserImportData{ Username: &username, Email: ptrStr(model.NewId() + "@example.com"), @@ -1490,7 +1490,7 @@ func TestImportImportPost(t *testing.T) { } // Create a user. - username := "n" + model.NewId() + username := model.NewId() ImportUser(&UserImportData{ Username: &username, Email: ptrStr(model.NewId() + "@example.com"), @@ -1738,7 +1738,7 @@ func TestImportBulkImport(t *testing.T) { teamName := model.NewId() channelName := model.NewId() - username := "n" + model.NewId() + username := 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 4cd26e729..bc5d36ef5 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: "joram" + model.NewId(), Email: model.NewId() + "@simulator.amazonses.com", Name: "Joram Wilander"} + glUser := oauthgitlab.GitLabUser{Id: int64(r.Intn(1000)), Username: 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) |