IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Usernames must start with a letter (#5581)"

Browse Source 
This reverts commit 2e911b77c3.
This commit is contained in:
Christopher Speller
2017-04-18 17:37:25 -04:00
parent 86c7e7cacd
commit 5398c82e1b
12 changed files with 85 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/import_test.go
View File

@@ -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}

4
app/user_test.go
View File

@@ -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)