summaryrefslogtreecommitdiffstats
path: root/store/storetest/team_store.go
diff options
context:
space:
mode:
Diffstat (limited to 'store/storetest/team_store.go')
-rw-r--r--store/storetest/team_store.go76
1 files changed, 38 insertions, 38 deletions
diff --git a/store/storetest/team_store.go b/store/storetest/team_store.go
index f21583cd1..40d69a2f2 100644
--- a/store/storetest/team_store.go
+++ b/store/storetest/team_store.go
@@ -50,7 +50,7 @@ func testTeamStoreSave(t *testing.T, ss store.Store) {
o1 := model.Team{}
o1.DisplayName = "DisplayName"
o1.Name = "z-z-z" + model.NewId() + "b"
- o1.Email = model.NewId() + "@nowhere.com"
+ o1.Email = MakeEmail()
o1.Type = model.TEAM_OPEN
if err := (<-ss.Team().Save(&o1)).Err; err != nil {
@@ -71,7 +71,7 @@ func testTeamStoreUpdate(t *testing.T, ss store.Store) {
o1 := model.Team{}
o1.DisplayName = "DisplayName"
o1.Name = "z-z-z" + model.NewId() + "b"
- o1.Email = model.NewId() + "@nowhere.com"
+ o1.Email = MakeEmail()
o1.Type = model.TEAM_OPEN
if err := (<-ss.Team().Save(&o1)).Err; err != nil {
t.Fatal(err)
@@ -98,7 +98,7 @@ func testTeamStoreUpdateDisplayName(t *testing.T, ss store.Store) {
o1 := &model.Team{}
o1.DisplayName = "Display Name"
o1.Name = "z-z-z" + model.NewId() + "b"
- o1.Email = model.NewId() + "@nowhere.com"
+ o1.Email = MakeEmail()
o1.Type = model.TEAM_OPEN
o1 = (<-ss.Team().Save(o1)).Data.(*model.Team)
@@ -118,7 +118,7 @@ func testTeamStoreGet(t *testing.T, ss store.Store) {
o1 := model.Team{}
o1.DisplayName = "DisplayName"
o1.Name = "z-z-z" + model.NewId() + "b"
- o1.Email = model.NewId() + "@nowhere.com"
+ o1.Email = MakeEmail()
o1.Type = model.TEAM_OPEN
store.Must(ss.Team().Save(&o1))
@@ -139,7 +139,7 @@ func testTeamStoreGetByName(t *testing.T, ss store.Store) {
o1 := model.Team{}
o1.DisplayName = "DisplayName"
o1.Name = "z-z-z" + model.NewId() + "b"
- o1.Email = model.NewId() + "@nowhere.com"
+ o1.Email = MakeEmail()
o1.Type = model.TEAM_OPEN
if err := (<-ss.Team().Save(&o1)).Err; err != nil {
@@ -164,7 +164,7 @@ func testTeamStoreSearchByName(t *testing.T, ss store.Store) {
o1.DisplayName = "DisplayName"
var name = "zzz" + model.NewId()
o1.Name = name + "b"
- o1.Email = model.NewId() + "@nowhere.com"
+ o1.Email = MakeEmail()
o1.Type = model.TEAM_OPEN
if err := (<-ss.Team().Save(&o1)).Err; err != nil {
@@ -184,7 +184,7 @@ func testTeamStoreSearchAll(t *testing.T, ss store.Store) {
o1 := model.Team{}
o1.DisplayName = "ADisplayName" + model.NewId()
o1.Name = "zz" + model.NewId() + "a"
- o1.Email = model.NewId() + "@nowhere.com"
+ o1.Email = MakeEmail()
o1.Type = model.TEAM_OPEN
if err := (<-ss.Team().Save(&o1)).Err; err != nil {
@@ -194,7 +194,7 @@ func testTeamStoreSearchAll(t *testing.T, ss store.Store) {
p2 := model.Team{}
p2.DisplayName = "BDisplayName" + model.NewId()
p2.Name = "b" + model.NewId() + "b"
- p2.Email = model.NewId() + "@nowhere.com"
+ p2.Email = MakeEmail()
p2.Type = model.TEAM_INVITE
if err := (<-ss.Team().Save(&p2)).Err; err != nil {
@@ -236,7 +236,7 @@ func testTeamStoreSearchOpen(t *testing.T, ss store.Store) {
o1 := model.Team{}
o1.DisplayName = "ADisplayName" + model.NewId()
o1.Name = "zz" + model.NewId() + "a"
- o1.Email = model.NewId() + "@nowhere.com"
+ o1.Email = MakeEmail()
o1.Type = model.TEAM_OPEN
o1.AllowOpenInvite = true
@@ -247,7 +247,7 @@ func testTeamStoreSearchOpen(t *testing.T, ss store.Store) {
o2 := model.Team{}
o2.DisplayName = "ADisplayName" + model.NewId()
o2.Name = "zz" + model.NewId() + "a"
- o2.Email = model.NewId() + "@nowhere.com"
+ o2.Email = MakeEmail()
o2.Type = model.TEAM_OPEN
o2.AllowOpenInvite = false
@@ -258,7 +258,7 @@ func testTeamStoreSearchOpen(t *testing.T, ss store.Store) {
p2 := model.Team{}
p2.DisplayName = "BDisplayName" + model.NewId()
p2.Name = "b" + model.NewId() + "b"
- p2.Email = model.NewId() + "@nowhere.com"
+ p2.Email = MakeEmail()
p2.Type = model.TEAM_INVITE
p2.AllowOpenInvite = true
@@ -325,7 +325,7 @@ func testTeamStoreGetByIniviteId(t *testing.T, ss store.Store) {
o1 := model.Team{}
o1.DisplayName = "DisplayName"
o1.Name = "z-z-z" + model.NewId() + "b"
- o1.Email = model.NewId() + "@nowhere.com"
+ o1.Email = MakeEmail()
o1.Type = model.TEAM_OPEN
o1.InviteId = model.NewId()
@@ -336,7 +336,7 @@ func testTeamStoreGetByIniviteId(t *testing.T, ss store.Store) {
o2 := model.Team{}
o2.DisplayName = "DisplayName"
o2.Name = "zz" + model.NewId() + "b"
- o2.Email = model.NewId() + "@nowhere.com"
+ o2.Email = MakeEmail()
o2.Type = model.TEAM_OPEN
if err := (<-ss.Team().Save(&o2)).Err; err != nil {
@@ -371,7 +371,7 @@ func testTeamStoreByUserId(t *testing.T, ss store.Store) {
o1 := &model.Team{}
o1.DisplayName = "DisplayName"
o1.Name = "z-z-z" + model.NewId() + "b"
- o1.Email = model.NewId() + "@nowhere.com"
+ o1.Email = MakeEmail()
o1.Type = model.TEAM_OPEN
o1.InviteId = model.NewId()
o1 = store.Must(ss.Team().Save(o1)).(*model.Team)
@@ -398,7 +398,7 @@ func testGetAllTeamListing(t *testing.T, ss store.Store) {
o1 := model.Team{}
o1.DisplayName = "DisplayName"
o1.Name = "z-z-z" + model.NewId() + "b"
- o1.Email = model.NewId() + "@nowhere.com"
+ o1.Email = MakeEmail()
o1.Type = model.TEAM_OPEN
o1.AllowOpenInvite = true
store.Must(ss.Team().Save(&o1))
@@ -406,14 +406,14 @@ func testGetAllTeamListing(t *testing.T, ss store.Store) {
o2 := model.Team{}
o2.DisplayName = "DisplayName"
o2.Name = "zz" + model.NewId() + "b"
- o2.Email = model.NewId() + "@nowhere.com"
+ o2.Email = MakeEmail()
o2.Type = model.TEAM_OPEN
store.Must(ss.Team().Save(&o2))
o3 := model.Team{}
o3.DisplayName = "DisplayName"
o3.Name = "z-z-z" + model.NewId() + "b"
- o3.Email = model.NewId() + "@nowhere.com"
+ o3.Email = MakeEmail()
o3.Type = model.TEAM_INVITE
o3.AllowOpenInvite = true
store.Must(ss.Team().Save(&o3))
@@ -421,7 +421,7 @@ func testGetAllTeamListing(t *testing.T, ss store.Store) {
o4 := model.Team{}
o4.DisplayName = "DisplayName"
o4.Name = "zz" + model.NewId() + "b"
- o4.Email = model.NewId() + "@nowhere.com"
+ o4.Email = MakeEmail()
o4.Type = model.TEAM_INVITE
store.Must(ss.Team().Save(&o4))
@@ -446,7 +446,7 @@ func testGetAllTeamPageListing(t *testing.T, ss store.Store) {
o1 := model.Team{}
o1.DisplayName = "DisplayName"
o1.Name = "z-z-z" + model.NewId() + "b"
- o1.Email = model.NewId() + "@nowhere.com"
+ o1.Email = MakeEmail()
o1.Type = model.TEAM_OPEN
o1.AllowOpenInvite = true
store.Must(ss.Team().Save(&o1))
@@ -454,7 +454,7 @@ func testGetAllTeamPageListing(t *testing.T, ss store.Store) {
o2 := model.Team{}
o2.DisplayName = "DisplayName"
o2.Name = "zz" + model.NewId() + "b"
- o2.Email = model.NewId() + "@nowhere.com"
+ o2.Email = MakeEmail()
o2.Type = model.TEAM_OPEN
o2.AllowOpenInvite = false
store.Must(ss.Team().Save(&o2))
@@ -462,7 +462,7 @@ func testGetAllTeamPageListing(t *testing.T, ss store.Store) {
o3 := model.Team{}
o3.DisplayName = "DisplayName"
o3.Name = "z-z-z" + model.NewId() + "b"
- o3.Email = model.NewId() + "@nowhere.com"
+ o3.Email = MakeEmail()
o3.Type = model.TEAM_INVITE
o3.AllowOpenInvite = true
store.Must(ss.Team().Save(&o3))
@@ -470,7 +470,7 @@ func testGetAllTeamPageListing(t *testing.T, ss store.Store) {
o4 := model.Team{}
o4.DisplayName = "DisplayName"
o4.Name = "zz" + model.NewId() + "b"
- o4.Email = model.NewId() + "@nowhere.com"
+ o4.Email = MakeEmail()
o4.Type = model.TEAM_INVITE
o4.AllowOpenInvite = false
store.Must(ss.Team().Save(&o4))
@@ -494,7 +494,7 @@ func testGetAllTeamPageListing(t *testing.T, ss store.Store) {
o5 := model.Team{}
o5.DisplayName = "DisplayName"
o5.Name = "z-z-z" + model.NewId() + "b"
- o5.Email = model.NewId() + "@nowhere.com"
+ o5.Email = MakeEmail()
o5.Type = model.TEAM_OPEN
o5.AllowOpenInvite = true
store.Must(ss.Team().Save(&o5))
@@ -536,7 +536,7 @@ func testDelete(t *testing.T, ss store.Store) {
o1 := model.Team{}
o1.DisplayName = "DisplayName"
o1.Name = "z-z-z" + model.NewId() + "b"
- o1.Email = model.NewId() + "@nowhere.com"
+ o1.Email = MakeEmail()
o1.Type = model.TEAM_OPEN
o1.AllowOpenInvite = true
store.Must(ss.Team().Save(&o1))
@@ -544,7 +544,7 @@ func testDelete(t *testing.T, ss store.Store) {
o2 := model.Team{}
o2.DisplayName = "DisplayName"
o2.Name = "zz" + model.NewId() + "b"
- o2.Email = model.NewId() + "@nowhere.com"
+ o2.Email = MakeEmail()
o2.Type = model.TEAM_OPEN
store.Must(ss.Team().Save(&o2))
@@ -557,7 +557,7 @@ func testTeamCount(t *testing.T, ss store.Store) {
o1 := model.Team{}
o1.DisplayName = "DisplayName"
o1.Name = "z-z-z" + model.NewId() + "b"
- o1.Email = model.NewId() + "@nowhere.com"
+ o1.Email = MakeEmail()
o1.Type = model.TEAM_OPEN
o1.AllowOpenInvite = true
store.Must(ss.Team().Save(&o1))
@@ -709,7 +709,7 @@ func testSaveTeamMemberMaxMembers(t *testing.T, ss store.Store) {
for i := 0; i < maxUsersPerTeam; i++ {
userIds[i] = store.Must(ss.User().Save(&model.User{
Username: model.NewId(),
- Email: model.NewId(),
+ Email: MakeEmail(),
})).(*model.User).Id
defer func(userId string) {
@@ -734,7 +734,7 @@ func testSaveTeamMemberMaxMembers(t *testing.T, ss store.Store) {
newUserId := store.Must(ss.User().Save(&model.User{
Username: model.NewId(),
- Email: model.NewId(),
+ Email: MakeEmail(),
})).(*model.User).Id
defer func() {
<-ss.User().PermanentDelete(newUserId)
@@ -787,7 +787,7 @@ func testSaveTeamMemberMaxMembers(t *testing.T, ss store.Store) {
newUserId2 := store.Must(ss.User().Save(&model.User{
Username: model.NewId(),
- Email: model.NewId(),
+ Email: MakeEmail(),
})).(*model.User).Id
if result := <-ss.Team().SaveMember(&model.TeamMember{TeamId: team.Id, UserId: newUserId2}, maxUsersPerTeam); result.Err != nil {
t.Fatal("should've been able to save new member after deleting one", result.Err)
@@ -898,11 +898,11 @@ func testGetTeamMembersByIds(t *testing.T, ss store.Store) {
func testTeamStoreMemberCount(t *testing.T, ss store.Store) {
u1 := &model.User{}
- u1.Email = model.NewId()
+ u1.Email = MakeEmail()
store.Must(ss.User().Save(u1))
u2 := &model.User{}
- u2.Email = model.NewId()
+ u2.Email = MakeEmail()
u2.DeleteAt = 1
store.Must(ss.User().Save(u2))
@@ -1054,7 +1054,7 @@ func testUpdateLastTeamIconUpdate(t *testing.T, ss store.Store) {
o1 := &model.Team{}
o1.DisplayName = "Display Name"
o1.Name = "z-z-z" + model.NewId() + "b"
- o1.Email = model.NewId() + "@nowhere.com"
+ o1.Email = MakeEmail()
o1.Type = model.TEAM_OPEN
o1.LastTeamIconUpdate = lastTeamIconUpdateInitial
o1 = (<-ss.Team().Save(o1)).Data.(*model.Team)
@@ -1094,7 +1094,7 @@ func testGetTeamsByScheme(t *testing.T, ss store.Store) {
t1 := &model.Team{
Name: model.NewId(),
DisplayName: model.NewId(),
- Email: model.NewId() + "@nowhere.com",
+ Email: MakeEmail(),
Type: model.TEAM_OPEN,
SchemeId: &s1.Id,
}
@@ -1102,7 +1102,7 @@ func testGetTeamsByScheme(t *testing.T, ss store.Store) {
t2 := &model.Team{
Name: model.NewId(),
DisplayName: model.NewId(),
- Email: model.NewId() + "@nowhere.com",
+ Email: MakeEmail(),
Type: model.TEAM_OPEN,
SchemeId: &s1.Id,
}
@@ -1110,7 +1110,7 @@ func testGetTeamsByScheme(t *testing.T, ss store.Store) {
t3 := &model.Team{
Name: model.NewId(),
DisplayName: model.NewId(),
- Email: model.NewId() + "@nowhere.com",
+ Email: MakeEmail(),
Type: model.TEAM_OPEN,
}
@@ -1142,7 +1142,7 @@ func testTeamStoreMigrateTeamMembers(t *testing.T, ss store.Store) {
t1 := &model.Team{
DisplayName: "Name",
Name: "z-z-z" + model.NewId() + "b",
- Email: model.NewId() + "@nowhere.com",
+ Email: MakeEmail(),
Type: model.TEAM_OPEN,
InviteId: model.NewId(),
SchemeId: &s1,
@@ -1218,7 +1218,7 @@ func testResetAllTeamSchemes(t *testing.T, ss store.Store) {
t1 := &model.Team{
Name: model.NewId(),
DisplayName: model.NewId(),
- Email: model.NewId() + "@nowhere.com",
+ Email: MakeEmail(),
Type: model.TEAM_OPEN,
SchemeId: &s1.Id,
}
@@ -1226,7 +1226,7 @@ func testResetAllTeamSchemes(t *testing.T, ss store.Store) {
t2 := &model.Team{
Name: model.NewId(),
DisplayName: model.NewId(),
- Email: model.NewId() + "@nowhere.com",
+ Email: MakeEmail(),
Type: model.TEAM_OPEN,
SchemeId: &s1.Id,
}