diff options
author | Joram Wilander <jwawilander@gmail.com> | 2017-03-03 12:04:15 -0500 |
---|---|---|
committer | Christopher Speller <crspeller@gmail.com> | 2017-03-03 12:04:15 -0500 |
commit | 2e911b77c3386833f8f0cea82c7b6b3e5583a08e (patch) | |
tree | 63c515b41e5abf024e94658554a02acaf40710df /store | |
parent | 09ee8e8a58df9526c619ac80cd76bca8cf4ca107 (diff) | |
download | chat-2e911b77c3386833f8f0cea82c7b6b3e5583a08e.tar.gz chat-2e911b77c3386833f8f0cea82c7b6b3e5583a08e.tar.bz2 chat-2e911b77c3386833f8f0cea82c7b6b3e5583a08e.zip |
Usernames must start with a letter (#5581)
Diffstat (limited to 'store')
-rw-r--r-- | store/sql_compliance_store_test.go | 4 | ||||
-rw-r--r-- | store/sql_team_store_test.go | 4 | ||||
-rw-r--r-- | store/sql_user_store_test.go | 20 |
3 files changed, 15 insertions, 13 deletions
diff --git a/store/sql_compliance_store_test.go b/store/sql_compliance_store_test.go index b7b270a42..25b6f2dce 100644 --- a/store/sql_compliance_store_test.go +++ b/store/sql_compliance_store_test.go @@ -59,13 +59,13 @@ func TestComplianceExport(t *testing.T) { u1 := &model.User{} u1.Email = model.NewId() - u1.Username = model.NewId() + u1.Username = "n" + model.NewId() u1 = Must(store.User().Save(u1)).(*model.User) Must(store.Team().SaveMember(&model.TeamMember{TeamId: t1.Id, UserId: u1.Id})) u2 := &model.User{} u2.Email = model.NewId() - u2.Username = model.NewId() + u2.Username = "n" + model.NewId() u2 = Must(store.User().Save(u2)).(*model.User) Must(store.Team().SaveMember(&model.TeamMember{TeamId: t1.Id, UserId: u2.Id})) diff --git a/store/sql_team_store_test.go b/store/sql_team_store_test.go index 62efa4d1a..58ac74fc0 100644 --- a/store/sql_team_store_test.go +++ b/store/sql_team_store_test.go @@ -145,10 +145,12 @@ func TestTeamStoreSearchByName(t *testing.T) { t.Fatal(err) } - if r1 := <-store.Team().SearchByName("zzz"); r1.Err != nil { + if r1 := <-store.Team().SearchByName(o1.Name); r1.Err != nil { t.Fatal(r1.Err) } else { if r1.Data.([]*model.Team)[0].ToJson() != o1.ToJson() { + t.Log(r1.Data.([]*model.Team)[0].ToJson()) + t.Log(o1.ToJson()) t.Fatal("invalid returned team") } } diff --git a/store/sql_user_store_test.go b/store/sql_user_store_test.go index e509653c1..104735455 100644 --- a/store/sql_user_store_test.go +++ b/store/sql_user_store_test.go @@ -18,7 +18,7 @@ func TestUserStoreSave(t *testing.T) { u1 := model.User{} u1.Email = model.NewId() - u1.Username = model.NewId() + u1.Username = "n" + model.NewId() if err := (<-store.User().Save(&u1)).Err; err != nil { t.Fatal("couldn't save user", err) @@ -49,7 +49,7 @@ func TestUserStoreSave(t *testing.T) { for i := 0; i < 50; i++ { u1.Id = "" u1.Email = model.NewId() - u1.Username = model.NewId() + u1.Username = "n" + model.NewId() if err := (<-store.User().Save(&u1)).Err; err != nil { t.Fatal("couldn't save item", err) } @@ -59,7 +59,7 @@ func TestUserStoreSave(t *testing.T) { u1.Id = "" u1.Email = model.NewId() - u1.Username = model.NewId() + u1.Username = "n" + model.NewId() if err := (<-store.User().Save(&u1)).Err; err != nil { t.Fatal("couldn't save item", err) } @@ -821,7 +821,7 @@ func TestUserStoreGetByUsername(t *testing.T) { u1 := &model.User{} u1.Email = model.NewId() - u1.Username = model.NewId() + u1.Username = "n" + model.NewId() Must(store.User().Save(u1)) Must(store.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id})) @@ -841,7 +841,7 @@ func TestUserStoreGetForLogin(t *testing.T) { u1 := &model.User{ Email: model.NewId(), - Username: model.NewId(), + Username: "n" + model.NewId(), AuthService: model.USER_AUTH_SERVICE_GITLAB, AuthData: &auth, } @@ -851,7 +851,7 @@ func TestUserStoreGetForLogin(t *testing.T) { u2 := &model.User{ Email: model.NewId(), - Username: model.NewId(), + Username: "n" + model.NewId(), AuthService: model.USER_AUTH_SERVICE_LDAP, AuthData: &auth2, } @@ -898,7 +898,7 @@ func TestUserStoreGetForLogin(t *testing.T) { // test a special case where two users will have conflicting login information so we throw a special error u3 := &model.User{ Email: model.NewId(), - Username: model.NewId(), + Username: "n" + model.NewId(), AuthService: model.USER_AUTH_SERVICE_LDAP, AuthData: &auth3, } @@ -906,7 +906,7 @@ func TestUserStoreGetForLogin(t *testing.T) { u4 := &model.User{ Email: model.NewId(), - Username: model.NewId(), + Username: "n" + model.NewId(), AuthService: model.USER_AUTH_SERVICE_LDAP, AuthData: &u3.Username, } @@ -1547,12 +1547,12 @@ func TestUserStoreAnalyticsGetSystemAdminCount(t *testing.T) { u1 := model.User{} u1.Email = model.NewId() - u1.Username = model.NewId() + u1.Username = "n" + model.NewId() u1.Roles = "system_user system_admin" u2 := model.User{} u2.Email = model.NewId() - u2.Username = model.NewId() + u2.Username = "n" + model.NewId() if err := (<-store.User().Save(&u1)).Err; err != nil { t.Fatal("couldn't save user", err) |