summaryrefslogtreecommitdiffstats
path: root/store
diff options
context:
space:
mode:
Diffstat (limited to 'store')
-rw-r--r--store/sql_compliance_store_test.go4
-rw-r--r--store/sql_team_store_test.go4
-rw-r--r--store/sql_user_store_test.go20
3 files changed, 13 insertions, 15 deletions
diff --git a/store/sql_compliance_store_test.go b/store/sql_compliance_store_test.go
index 7fb772c9c..eac7dce3c 100644
--- a/store/sql_compliance_store_test.go
+++ b/store/sql_compliance_store_test.go
@@ -75,13 +75,13 @@ func TestComplianceExport(t *testing.T) {
u1 := &model.User{}
u1.Email = model.NewId()
- u1.Username = "n" + model.NewId()
+ u1.Username = 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 = "n" + model.NewId()
+ u2.Username = 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 85c758480..c7aabb0be 100644
--- a/store/sql_team_store_test.go
+++ b/store/sql_team_store_test.go
@@ -146,12 +146,10 @@ func TestTeamStoreSearchByName(t *testing.T) {
t.Fatal(err)
}
- if r1 := <-store.Team().SearchByName(o1.Name); r1.Err != nil {
+ if r1 := <-store.Team().SearchByName("zzz"); 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 94fd30a6f..7d7379668 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 = "n" + model.NewId()
+ u1.Username = 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 = "n" + model.NewId()
+ u1.Username = 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 = "n" + model.NewId()
+ u1.Username = model.NewId()
if err := (<-store.User().Save(&u1)).Err; err != nil {
t.Fatal("couldn't save item", err)
}
@@ -936,7 +936,7 @@ func TestUserStoreGetByUsername(t *testing.T) {
u1 := &model.User{}
u1.Email = model.NewId()
- u1.Username = "n" + model.NewId()
+ u1.Username = model.NewId()
Must(store.User().Save(u1))
Must(store.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}))
@@ -956,7 +956,7 @@ func TestUserStoreGetForLogin(t *testing.T) {
u1 := &model.User{
Email: model.NewId(),
- Username: "n" + model.NewId(),
+ Username: model.NewId(),
AuthService: model.USER_AUTH_SERVICE_GITLAB,
AuthData: &auth,
}
@@ -966,7 +966,7 @@ func TestUserStoreGetForLogin(t *testing.T) {
u2 := &model.User{
Email: model.NewId(),
- Username: "n" + model.NewId(),
+ Username: model.NewId(),
AuthService: model.USER_AUTH_SERVICE_LDAP,
AuthData: &auth2,
}
@@ -1013,7 +1013,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: "n" + model.NewId(),
+ Username: model.NewId(),
AuthService: model.USER_AUTH_SERVICE_LDAP,
AuthData: &auth3,
}
@@ -1021,7 +1021,7 @@ func TestUserStoreGetForLogin(t *testing.T) {
u4 := &model.User{
Email: model.NewId(),
- Username: "n" + model.NewId(),
+ Username: model.NewId(),
AuthService: model.USER_AUTH_SERVICE_LDAP,
AuthData: &u3.Username,
}
@@ -1802,12 +1802,12 @@ func TestUserStoreAnalyticsGetSystemAdminCount(t *testing.T) {
u1 := model.User{}
u1.Email = model.NewId()
- u1.Username = "n" + model.NewId()
+ u1.Username = model.NewId()
u1.Roles = "system_user system_admin"
u2 := model.User{}
u2.Email = model.NewId()
- u2.Username = "n" + model.NewId()
+ u2.Username = model.NewId()
if err := (<-store.User().Save(&u1)).Err; err != nil {
t.Fatal("couldn't save user", err)