From ec2af296b25d6edef0fea54a8af02bed912c6e37 Mon Sep 17 00:00:00 2001 From: =Corey Hulen Date: Sun, 5 Jul 2015 09:06:56 -0800 Subject: fixing race condition in unit tests --- api/channel_test.go | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) (limited to 'api/channel_test.go') diff --git a/api/channel_test.go b/api/channel_test.go index dfae840dc..819368c41 100644 --- a/api/channel_test.go +++ b/api/channel_test.go @@ -20,7 +20,7 @@ func TestCreateChannel(t *testing.T) { user := &model.User{TeamId: team.Id, Email: model.NewId() + "corey@test.com", FullName: "Corey Hulen", Password: "pwd"} user = Client.Must(Client.CreateUser(user, "")).Data.(*model.User) - Srv.Store.User().VerifyEmail(user.Id) + <-<-Srv.Store.User().VerifyEmail(user.Id) Client.LoginByEmail(team.Domain, user.Email, "pwd") @@ -88,11 +88,11 @@ func TestCreateDirectChannel(t *testing.T) { user := &model.User{TeamId: team.Id, Email: model.NewId() + "corey@test.com", FullName: "Corey Hulen", Password: "pwd"} user = Client.Must(Client.CreateUser(user, "")).Data.(*model.User) - Srv.Store.User().VerifyEmail(user.Id) + <-Srv.Store.User().VerifyEmail(user.Id) user2 := &model.User{TeamId: team.Id, Email: model.NewId() + "corey@test.com", FullName: "Corey Hulen", Password: "pwd"} user2 = Client.Must(Client.CreateUser(user2, "")).Data.(*model.User) - Srv.Store.User().VerifyEmail(user2.Id) + <-Srv.Store.User().VerifyEmail(user2.Id) Client.LoginByEmail(team.Domain, user.Email, "pwd") @@ -214,7 +214,7 @@ func TestUpdateChannelDesc(t *testing.T) { user := &model.User{TeamId: team.Id, Email: model.NewId() + "corey@test.com", FullName: "Corey Hulen", Password: "pwd"} user = Client.Must(Client.CreateUser(user, "")).Data.(*model.User) - Srv.Store.User().VerifyEmail(user.Id) + <-Srv.Store.User().VerifyEmail(user.Id) Client.LoginByEmail(team.Domain, user.Email, "pwd") @@ -257,7 +257,7 @@ func TestUpdateChannelDesc(t *testing.T) { user2 := &model.User{TeamId: team.Id, Email: model.NewId() + "corey@test.com", FullName: "Corey Hulen", Password: "pwd"} user2 = Client.Must(Client.CreateUser(user2, "")).Data.(*model.User) - Srv.Store.User().VerifyEmail(user2.Id) + <-Srv.Store.User().VerifyEmail(user2.Id) Client.LoginByEmail(team.Domain, user2.Email, "pwd") @@ -276,7 +276,7 @@ func TestGetChannel(t *testing.T) { user := &model.User{TeamId: team.Id, Email: model.NewId() + "corey@test.com", FullName: "Corey Hulen", Password: "pwd"} user = Client.Must(Client.CreateUser(user, "")).Data.(*model.User) - Srv.Store.User().VerifyEmail(user.Id) + <-Srv.Store.User().VerifyEmail(user.Id) Client.LoginByEmail(team.Domain, user.Email, "pwd") @@ -318,7 +318,7 @@ func TestGetMoreChannel(t *testing.T) { user1 := &model.User{TeamId: team.Id, Email: model.NewId() + "corey@test.com", FullName: "Corey Hulen", Password: "pwd"} user1 = Client.Must(Client.CreateUser(user1, "")).Data.(*model.User) - Srv.Store.User().VerifyEmail(user1.Id) + <-Srv.Store.User().VerifyEmail(user1.Id) Client.LoginByEmail(team.Domain, user1.Email, "pwd") @@ -330,7 +330,7 @@ func TestGetMoreChannel(t *testing.T) { user2 := &model.User{TeamId: team.Id, Email: model.NewId() + "corey@test.com", FullName: "Corey Hulen", Password: "pwd"} user2 = Client.Must(Client.CreateUser(user2, "")).Data.(*model.User) - Srv.Store.User().VerifyEmail(user2.Id) + <-Srv.Store.User().VerifyEmail(user2.Id) Client.LoginByEmail(team.Domain, user2.Email, "pwd") @@ -362,7 +362,7 @@ func TestJoinChannel(t *testing.T) { user1 := &model.User{TeamId: team.Id, Email: model.NewId() + "corey@test.com", FullName: "Corey Hulen", Password: "pwd"} user1 = Client.Must(Client.CreateUser(user1, "")).Data.(*model.User) - Srv.Store.User().VerifyEmail(user1.Id) + <-Srv.Store.User().VerifyEmail(user1.Id) Client.LoginByEmail(team.Domain, user1.Email, "pwd") @@ -374,7 +374,7 @@ func TestJoinChannel(t *testing.T) { user2 := &model.User{TeamId: team.Id, Email: model.NewId() + "corey@test.com", FullName: "Corey Hulen", Password: "pwd"} user2 = Client.Must(Client.CreateUser(user2, "")).Data.(*model.User) - Srv.Store.User().VerifyEmail(user2.Id) + <-Srv.Store.User().VerifyEmail(user2.Id) Client.LoginByEmail(team.Domain, user2.Email, "pwd") @@ -406,7 +406,7 @@ func TestLeaveChannel(t *testing.T) { user1 := &model.User{TeamId: team.Id, Email: model.NewId() + "corey@test.com", FullName: "Corey Hulen", Password: "pwd"} user1 = Client.Must(Client.CreateUser(user1, "")).Data.(*model.User) - Srv.Store.User().VerifyEmail(user1.Id) + <-Srv.Store.User().VerifyEmail(user1.Id) Client.LoginByEmail(team.Domain, user1.Email, "pwd") @@ -418,7 +418,7 @@ func TestLeaveChannel(t *testing.T) { user2 := &model.User{TeamId: team.Id, Email: model.NewId() + "corey@test.com", FullName: "Corey Hulen", Password: "pwd"} user2 = Client.Must(Client.CreateUser(user2, "")).Data.(*model.User) - Srv.Store.User().VerifyEmail(user2.Id) + <-Srv.Store.User().VerifyEmail(user2.Id) Client.LoginByEmail(team.Domain, user2.Email, "pwd") @@ -525,7 +525,7 @@ func TestGetChannelExtraInfo(t *testing.T) { user := &model.User{TeamId: team.Id, Email: model.NewId() + "corey@test.com", FullName: "Corey Hulen", Password: "pwd"} user = Client.Must(Client.CreateUser(user, "")).Data.(*model.User) - Srv.Store.User().VerifyEmail(user.Id) + <-Srv.Store.User().VerifyEmail(user.Id) Client.LoginByEmail(team.Domain, user.Email, "pwd") @@ -546,7 +546,7 @@ func TestAddChannelMember(t *testing.T) { user1 := &model.User{TeamId: team.Id, Email: model.NewId() + "corey@test.com", FullName: "Corey Hulen", Password: "pwd"} user1 = Client.Must(Client.CreateUser(user1, "")).Data.(*model.User) - Srv.Store.User().VerifyEmail(user1.Id) + <-Srv.Store.User().VerifyEmail(user1.Id) Client.LoginByEmail(team.Domain, user1.Email, "pwd") @@ -555,7 +555,7 @@ func TestAddChannelMember(t *testing.T) { user2 := &model.User{TeamId: team.Id, Email: model.NewId() + "corey@test.com", FullName: "Corey Hulen", Password: "pwd"} user2 = Client.Must(Client.CreateUser(user2, "")).Data.(*model.User) - Srv.Store.User().VerifyEmail(user2.Id) + <-Srv.Store.User().VerifyEmail(user2.Id) if _, err := Client.AddChannelMember(channel1.Id, user2.Id); err != nil { t.Fatal(err) @@ -674,7 +674,7 @@ func TestUpdateNotifyLevel(t *testing.T) { user := &model.User{TeamId: team.Id, Email: model.NewId() + "corey@test.com", FullName: "Corey Hulen", Password: "pwd"} user = Client.Must(Client.CreateUser(user, "")).Data.(*model.User) - Srv.Store.User().VerifyEmail(user.Id) + <-Srv.Store.User().VerifyEmail(user.Id) Client.LoginByEmail(team.Domain, user.Email, "pwd") @@ -755,7 +755,7 @@ func TestFuzzyChannel(t *testing.T) { user := &model.User{TeamId: team.Id, Email: model.NewId() + "corey@test.com", FullName: "Corey Hulen", Password: "pwd"} user = Client.Must(Client.CreateUser(user, "")).Data.(*model.User) - Srv.Store.User().VerifyEmail(user.Id) + <-Srv.Store.User().VerifyEmail(user.Id) Client.LoginByEmail(team.Domain, user.Email, "pwd") -- cgit v1.2.3-1-g7c22 From ed178457cd4f2107d858e902e6fd5d13169bd16a Mon Sep 17 00:00:00 2001 From: =Corey Hulen Date: Sun, 5 Jul 2015 09:13:06 -0800 Subject: fixing unit tests --- api/channel_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'api/channel_test.go') diff --git a/api/channel_test.go b/api/channel_test.go index 819368c41..78b179645 100644 --- a/api/channel_test.go +++ b/api/channel_test.go @@ -20,7 +20,7 @@ func TestCreateChannel(t *testing.T) { user := &model.User{TeamId: team.Id, Email: model.NewId() + "corey@test.com", FullName: "Corey Hulen", Password: "pwd"} user = Client.Must(Client.CreateUser(user, "")).Data.(*model.User) - <-<-Srv.Store.User().VerifyEmail(user.Id) + <-Srv.Store.User().VerifyEmail(user.Id) Client.LoginByEmail(team.Domain, user.Email, "pwd") -- cgit v1.2.3-1-g7c22 From 5582a0590905393b4e6d0b0d3e586863f17f52ae Mon Sep 17 00:00:00 2001 From: =Corey Hulen Date: Sun, 5 Jul 2015 09:22:32 -0800 Subject: Fixing unit test --- api/channel_test.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'api/channel_test.go') diff --git a/api/channel_test.go b/api/channel_test.go index 78b179645..befd5615b 100644 --- a/api/channel_test.go +++ b/api/channel_test.go @@ -147,7 +147,7 @@ func TestUpdateChannel(t *testing.T) { userChannelAdmin := &model.User{TeamId: team.Id, Email: model.NewId() + "corey@test.com", FullName: "Corey Hulen", Password: "pwd"} userChannelAdmin = Client.Must(Client.CreateUser(userChannelAdmin, "")).Data.(*model.User) - Srv.Store.User().VerifyEmail(userChannelAdmin.Id) + <-Srv.Store.User().VerifyEmail(userChannelAdmin.Id) userStd := &model.User{TeamId: team.Id, Email: model.NewId() + "corey@test.com", FullName: "Corey Hulen", Password: "pwd"} userStd = Client.Must(Client.CreateUser(userStd, "")).Data.(*model.User) @@ -459,7 +459,7 @@ func TestDeleteChannel(t *testing.T) { userChannelAdmin := &model.User{TeamId: team.Id, Email: model.NewId() + "corey@test.com", FullName: "Corey Hulen", Password: "pwd"} userChannelAdmin = Client.Must(Client.CreateUser(userChannelAdmin, "")).Data.(*model.User) - Srv.Store.User().VerifyEmail(userChannelAdmin.Id) + <-Srv.Store.User().VerifyEmail(userChannelAdmin.Id) Client.LoginByEmail(team.Domain, userChannelAdmin.Email, "pwd") @@ -608,7 +608,7 @@ func TestRemoveChannelMember(t *testing.T) { userChannelAdmin := &model.User{TeamId: team.Id, Email: model.NewId() + "corey@test.com", FullName: "Corey Hulen", Password: "pwd"} userChannelAdmin = Client.Must(Client.CreateUser(userChannelAdmin, "")).Data.(*model.User) - Srv.Store.User().VerifyEmail(userChannelAdmin.Id) + <-Srv.Store.User().VerifyEmail(userChannelAdmin.Id) Client.LoginByEmail(team.Domain, userChannelAdmin.Email, "pwd") -- cgit v1.2.3-1-g7c22 From 60f53504025819b57999de3cbb53a68fa102f007 Mon Sep 17 00:00:00 2001 From: =Corey Hulen Date: Sun, 5 Jul 2015 09:27:00 -0800 Subject: Fixing unit test --- api/channel_test.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'api/channel_test.go') diff --git a/api/channel_test.go b/api/channel_test.go index befd5615b..4dd2afc54 100644 --- a/api/channel_test.go +++ b/api/channel_test.go @@ -151,7 +151,7 @@ func TestUpdateChannel(t *testing.T) { userStd := &model.User{TeamId: team.Id, Email: model.NewId() + "corey@test.com", FullName: "Corey Hulen", Password: "pwd"} userStd = Client.Must(Client.CreateUser(userStd, "")).Data.(*model.User) - Srv.Store.User().VerifyEmail(userStd.Id) + <-Srv.Store.User().VerifyEmail(userStd.Id) userStd.Roles = "" Client.LoginByEmail(team.Domain, userChannelAdmin.Email, "pwd") @@ -491,7 +491,7 @@ func TestDeleteChannel(t *testing.T) { userStd := &model.User{TeamId: team.Id, Email: model.NewId() + "corey@test.com", FullName: "Corey Hulen", Password: "pwd"} userStd = Client.Must(Client.CreateUser(userStd, "")).Data.(*model.User) - Srv.Store.User().VerifyEmail(userStd.Id) + <-Srv.Store.User().VerifyEmail(userStd.Id) Client.LoginByEmail(team.Domain, userStd.Email, "pwd") @@ -604,7 +604,7 @@ func TestRemoveChannelMember(t *testing.T) { userTeamAdmin := &model.User{TeamId: team.Id, Email: team.Email, FullName: "Corey Hulen", Password: "pwd"} userTeamAdmin = Client.Must(Client.CreateUser(userTeamAdmin, "")).Data.(*model.User) - Srv.Store.User().VerifyEmail(userTeamAdmin.Id) + <-Srv.Store.User().VerifyEmail(userTeamAdmin.Id) userChannelAdmin := &model.User{TeamId: team.Id, Email: model.NewId() + "corey@test.com", FullName: "Corey Hulen", Password: "pwd"} userChannelAdmin = Client.Must(Client.CreateUser(userChannelAdmin, "")).Data.(*model.User) @@ -624,7 +624,7 @@ func TestRemoveChannelMember(t *testing.T) { userStd := &model.User{TeamId: team.Id, Email: model.NewId() + "corey@test.com", FullName: "Corey Hulen", Password: "pwd"} userStd = Client.Must(Client.CreateUser(userStd, "")).Data.(*model.User) - Srv.Store.User().VerifyEmail(userStd.Id) + <-Srv.Store.User().VerifyEmail(userStd.Id) Client.Must(Client.AddChannelMember(channel1.Id, userStd.Id)) -- cgit v1.2.3-1-g7c22 From e01aea78251964006104d4700f010cb150947606 Mon Sep 17 00:00:00 2001 From: =Corey Hulen Date: Sun, 5 Jul 2015 09:52:23 -0800 Subject: fixing unit tests --- api/channel_test.go | 2 ++ 1 file changed, 2 insertions(+) (limited to 'api/channel_test.go') diff --git a/api/channel_test.go b/api/channel_test.go index 4dd2afc54..708402ee3 100644 --- a/api/channel_test.go +++ b/api/channel_test.go @@ -7,6 +7,7 @@ import ( "github.com/mattermost/platform/model" "net/http" "testing" + "time" ) func TestCreateChannel(t *testing.T) { @@ -687,6 +688,7 @@ func TestUpdateNotifyLevel(t *testing.T) { data["notify_level"] = model.CHANNEL_NOTIFY_MENTION timeBeforeUpdate := model.GetMillis() + time.Sleep(100 * time.Millisecond) if _, err := Client.UpdateNotifyLevel(data); err != nil { t.Fatal(err) -- cgit v1.2.3-1-g7c22 From 34fb817a4a4cd2761ba35a2c94f9d0eb79d06244 Mon Sep 17 00:00:00 2001 From: =Corey Hulen Date: Mon, 6 Jul 2015 00:50:42 -0800 Subject: Fixing unit tests --- api/channel_test.go | 53 +++++++++++++++++++++++++++-------------------------- 1 file changed, 27 insertions(+), 26 deletions(-) (limited to 'api/channel_test.go') diff --git a/api/channel_test.go b/api/channel_test.go index 708402ee3..ff09ab4bc 100644 --- a/api/channel_test.go +++ b/api/channel_test.go @@ -5,6 +5,7 @@ package api import ( "github.com/mattermost/platform/model" + "github.com/mattermost/platform/store" "net/http" "testing" "time" @@ -21,7 +22,7 @@ func TestCreateChannel(t *testing.T) { user := &model.User{TeamId: team.Id, Email: model.NewId() + "corey@test.com", FullName: "Corey Hulen", Password: "pwd"} user = Client.Must(Client.CreateUser(user, "")).Data.(*model.User) - <-Srv.Store.User().VerifyEmail(user.Id) + store.Must(Srv.Store.User().VerifyEmail(user.Id)) Client.LoginByEmail(team.Domain, user.Email, "pwd") @@ -89,11 +90,11 @@ func TestCreateDirectChannel(t *testing.T) { user := &model.User{TeamId: team.Id, Email: model.NewId() + "corey@test.com", FullName: "Corey Hulen", Password: "pwd"} user = Client.Must(Client.CreateUser(user, "")).Data.(*model.User) - <-Srv.Store.User().VerifyEmail(user.Id) + store.Must(Srv.Store.User().VerifyEmail(user.Id)) user2 := &model.User{TeamId: team.Id, Email: model.NewId() + "corey@test.com", FullName: "Corey Hulen", Password: "pwd"} user2 = Client.Must(Client.CreateUser(user2, "")).Data.(*model.User) - <-Srv.Store.User().VerifyEmail(user2.Id) + store.Must(Srv.Store.User().VerifyEmail(user2.Id)) Client.LoginByEmail(team.Domain, user.Email, "pwd") @@ -144,15 +145,15 @@ func TestUpdateChannel(t *testing.T) { userTeamAdmin := &model.User{TeamId: team.Id, Email: team.Email, FullName: "Corey Hulen", Password: "pwd"} userTeamAdmin = Client.Must(Client.CreateUser(userTeamAdmin, "")).Data.(*model.User) - Srv.Store.User().VerifyEmail(userTeamAdmin.Id) + store.Must(Srv.Store.User().VerifyEmail(userTeamAdmin.Id)) userChannelAdmin := &model.User{TeamId: team.Id, Email: model.NewId() + "corey@test.com", FullName: "Corey Hulen", Password: "pwd"} userChannelAdmin = Client.Must(Client.CreateUser(userChannelAdmin, "")).Data.(*model.User) - <-Srv.Store.User().VerifyEmail(userChannelAdmin.Id) + store.Must(Srv.Store.User().VerifyEmail(userChannelAdmin.Id)) userStd := &model.User{TeamId: team.Id, Email: model.NewId() + "corey@test.com", FullName: "Corey Hulen", Password: "pwd"} userStd = Client.Must(Client.CreateUser(userStd, "")).Data.(*model.User) - <-Srv.Store.User().VerifyEmail(userStd.Id) + store.Must(Srv.Store.User().VerifyEmail(userStd.Id)) userStd.Roles = "" Client.LoginByEmail(team.Domain, userChannelAdmin.Email, "pwd") @@ -215,7 +216,7 @@ func TestUpdateChannelDesc(t *testing.T) { user := &model.User{TeamId: team.Id, Email: model.NewId() + "corey@test.com", FullName: "Corey Hulen", Password: "pwd"} user = Client.Must(Client.CreateUser(user, "")).Data.(*model.User) - <-Srv.Store.User().VerifyEmail(user.Id) + store.Must(Srv.Store.User().VerifyEmail(user.Id)) Client.LoginByEmail(team.Domain, user.Email, "pwd") @@ -258,7 +259,7 @@ func TestUpdateChannelDesc(t *testing.T) { user2 := &model.User{TeamId: team.Id, Email: model.NewId() + "corey@test.com", FullName: "Corey Hulen", Password: "pwd"} user2 = Client.Must(Client.CreateUser(user2, "")).Data.(*model.User) - <-Srv.Store.User().VerifyEmail(user2.Id) + store.Must(Srv.Store.User().VerifyEmail(user2.Id)) Client.LoginByEmail(team.Domain, user2.Email, "pwd") @@ -277,7 +278,7 @@ func TestGetChannel(t *testing.T) { user := &model.User{TeamId: team.Id, Email: model.NewId() + "corey@test.com", FullName: "Corey Hulen", Password: "pwd"} user = Client.Must(Client.CreateUser(user, "")).Data.(*model.User) - <-Srv.Store.User().VerifyEmail(user.Id) + store.Must(Srv.Store.User().VerifyEmail(user.Id)) Client.LoginByEmail(team.Domain, user.Email, "pwd") @@ -319,7 +320,7 @@ func TestGetMoreChannel(t *testing.T) { user1 := &model.User{TeamId: team.Id, Email: model.NewId() + "corey@test.com", FullName: "Corey Hulen", Password: "pwd"} user1 = Client.Must(Client.CreateUser(user1, "")).Data.(*model.User) - <-Srv.Store.User().VerifyEmail(user1.Id) + store.Must(Srv.Store.User().VerifyEmail(user1.Id)) Client.LoginByEmail(team.Domain, user1.Email, "pwd") @@ -331,7 +332,7 @@ func TestGetMoreChannel(t *testing.T) { user2 := &model.User{TeamId: team.Id, Email: model.NewId() + "corey@test.com", FullName: "Corey Hulen", Password: "pwd"} user2 = Client.Must(Client.CreateUser(user2, "")).Data.(*model.User) - <-Srv.Store.User().VerifyEmail(user2.Id) + store.Must(Srv.Store.User().VerifyEmail(user2.Id)) Client.LoginByEmail(team.Domain, user2.Email, "pwd") @@ -363,7 +364,7 @@ func TestJoinChannel(t *testing.T) { user1 := &model.User{TeamId: team.Id, Email: model.NewId() + "corey@test.com", FullName: "Corey Hulen", Password: "pwd"} user1 = Client.Must(Client.CreateUser(user1, "")).Data.(*model.User) - <-Srv.Store.User().VerifyEmail(user1.Id) + store.Must(Srv.Store.User().VerifyEmail(user1.Id)) Client.LoginByEmail(team.Domain, user1.Email, "pwd") @@ -375,7 +376,7 @@ func TestJoinChannel(t *testing.T) { user2 := &model.User{TeamId: team.Id, Email: model.NewId() + "corey@test.com", FullName: "Corey Hulen", Password: "pwd"} user2 = Client.Must(Client.CreateUser(user2, "")).Data.(*model.User) - <-Srv.Store.User().VerifyEmail(user2.Id) + store.Must(Srv.Store.User().VerifyEmail(user2.Id)) Client.LoginByEmail(team.Domain, user2.Email, "pwd") @@ -407,7 +408,7 @@ func TestLeaveChannel(t *testing.T) { user1 := &model.User{TeamId: team.Id, Email: model.NewId() + "corey@test.com", FullName: "Corey Hulen", Password: "pwd"} user1 = Client.Must(Client.CreateUser(user1, "")).Data.(*model.User) - <-Srv.Store.User().VerifyEmail(user1.Id) + store.Must(Srv.Store.User().VerifyEmail(user1.Id)) Client.LoginByEmail(team.Domain, user1.Email, "pwd") @@ -419,7 +420,7 @@ func TestLeaveChannel(t *testing.T) { user2 := &model.User{TeamId: team.Id, Email: model.NewId() + "corey@test.com", FullName: "Corey Hulen", Password: "pwd"} user2 = Client.Must(Client.CreateUser(user2, "")).Data.(*model.User) - <-Srv.Store.User().VerifyEmail(user2.Id) + store.Must(Srv.Store.User().VerifyEmail(user2.Id)) Client.LoginByEmail(team.Domain, user2.Email, "pwd") @@ -456,11 +457,11 @@ func TestDeleteChannel(t *testing.T) { userTeamAdmin := &model.User{TeamId: team.Id, Email: team.Email, FullName: "Corey Hulen", Password: "pwd"} userTeamAdmin = Client.Must(Client.CreateUser(userTeamAdmin, "")).Data.(*model.User) - Srv.Store.User().VerifyEmail(userTeamAdmin.Id) + store.Must(Srv.Store.User().VerifyEmail(userTeamAdmin.Id)) userChannelAdmin := &model.User{TeamId: team.Id, Email: model.NewId() + "corey@test.com", FullName: "Corey Hulen", Password: "pwd"} userChannelAdmin = Client.Must(Client.CreateUser(userChannelAdmin, "")).Data.(*model.User) - <-Srv.Store.User().VerifyEmail(userChannelAdmin.Id) + store.Must(Srv.Store.User().VerifyEmail(userChannelAdmin.Id)) Client.LoginByEmail(team.Domain, userChannelAdmin.Email, "pwd") @@ -492,7 +493,7 @@ func TestDeleteChannel(t *testing.T) { userStd := &model.User{TeamId: team.Id, Email: model.NewId() + "corey@test.com", FullName: "Corey Hulen", Password: "pwd"} userStd = Client.Must(Client.CreateUser(userStd, "")).Data.(*model.User) - <-Srv.Store.User().VerifyEmail(userStd.Id) + store.Must(Srv.Store.User().VerifyEmail(userStd.Id)) Client.LoginByEmail(team.Domain, userStd.Email, "pwd") @@ -526,7 +527,7 @@ func TestGetChannelExtraInfo(t *testing.T) { user := &model.User{TeamId: team.Id, Email: model.NewId() + "corey@test.com", FullName: "Corey Hulen", Password: "pwd"} user = Client.Must(Client.CreateUser(user, "")).Data.(*model.User) - <-Srv.Store.User().VerifyEmail(user.Id) + store.Must(Srv.Store.User().VerifyEmail(user.Id)) Client.LoginByEmail(team.Domain, user.Email, "pwd") @@ -547,7 +548,7 @@ func TestAddChannelMember(t *testing.T) { user1 := &model.User{TeamId: team.Id, Email: model.NewId() + "corey@test.com", FullName: "Corey Hulen", Password: "pwd"} user1 = Client.Must(Client.CreateUser(user1, "")).Data.(*model.User) - <-Srv.Store.User().VerifyEmail(user1.Id) + store.Must(Srv.Store.User().VerifyEmail(user1.Id)) Client.LoginByEmail(team.Domain, user1.Email, "pwd") @@ -556,7 +557,7 @@ func TestAddChannelMember(t *testing.T) { user2 := &model.User{TeamId: team.Id, Email: model.NewId() + "corey@test.com", FullName: "Corey Hulen", Password: "pwd"} user2 = Client.Must(Client.CreateUser(user2, "")).Data.(*model.User) - <-Srv.Store.User().VerifyEmail(user2.Id) + store.Must(Srv.Store.User().VerifyEmail(user2.Id)) if _, err := Client.AddChannelMember(channel1.Id, user2.Id); err != nil { t.Fatal(err) @@ -605,11 +606,11 @@ func TestRemoveChannelMember(t *testing.T) { userTeamAdmin := &model.User{TeamId: team.Id, Email: team.Email, FullName: "Corey Hulen", Password: "pwd"} userTeamAdmin = Client.Must(Client.CreateUser(userTeamAdmin, "")).Data.(*model.User) - <-Srv.Store.User().VerifyEmail(userTeamAdmin.Id) + store.Must(Srv.Store.User().VerifyEmail(userTeamAdmin.Id)) userChannelAdmin := &model.User{TeamId: team.Id, Email: model.NewId() + "corey@test.com", FullName: "Corey Hulen", Password: "pwd"} userChannelAdmin = Client.Must(Client.CreateUser(userChannelAdmin, "")).Data.(*model.User) - <-Srv.Store.User().VerifyEmail(userChannelAdmin.Id) + store.Must(Srv.Store.User().VerifyEmail(userChannelAdmin.Id)) Client.LoginByEmail(team.Domain, userChannelAdmin.Email, "pwd") @@ -625,7 +626,7 @@ func TestRemoveChannelMember(t *testing.T) { userStd := &model.User{TeamId: team.Id, Email: model.NewId() + "corey@test.com", FullName: "Corey Hulen", Password: "pwd"} userStd = Client.Must(Client.CreateUser(userStd, "")).Data.(*model.User) - <-Srv.Store.User().VerifyEmail(userStd.Id) + store.Must(Srv.Store.User().VerifyEmail(userStd.Id)) Client.Must(Client.AddChannelMember(channel1.Id, userStd.Id)) @@ -675,7 +676,7 @@ func TestUpdateNotifyLevel(t *testing.T) { user := &model.User{TeamId: team.Id, Email: model.NewId() + "corey@test.com", FullName: "Corey Hulen", Password: "pwd"} user = Client.Must(Client.CreateUser(user, "")).Data.(*model.User) - <-Srv.Store.User().VerifyEmail(user.Id) + store.Must(Srv.Store.User().VerifyEmail(user.Id)) Client.LoginByEmail(team.Domain, user.Email, "pwd") @@ -757,7 +758,7 @@ func TestFuzzyChannel(t *testing.T) { user := &model.User{TeamId: team.Id, Email: model.NewId() + "corey@test.com", FullName: "Corey Hulen", Password: "pwd"} user = Client.Must(Client.CreateUser(user, "")).Data.(*model.User) - <-Srv.Store.User().VerifyEmail(user.Id) + store.Must(Srv.Store.User().VerifyEmail(user.Id)) Client.LoginByEmail(team.Domain, user.Email, "pwd") -- cgit v1.2.3-1-g7c22