Migrating User Store VerifyEmail, GetByAuth and GetByEmail functions to sync by default (#10941)

api4/websocket_test.go

@@ -11,9 +11,9 @@ import (
 	"time"
 
 	"github.com/gorilla/websocket"
+	"github.com/stretchr/testify/require"
 
 	"github.com/mattermost/mattermost-server/model"
-	"github.com/mattermost/mattermost-server/store"
 )
 
 func TestWebSocket(t *testing.T) {
@@ -304,12 +304,14 @@ func TestWebSocketStatuses(t *testing.T) {
 	user := model.User{Email: strings.ToLower(model.NewId()) + "success+test@simulator.amazonses.com", Nickname: "Corey Hulen", Password: "passwd1"}
 	ruser := Client.Must(Client.CreateUser(&user)).(*model.User)
 	th.LinkUserToTeam(ruser, rteam)
-	store.Must(th.App.Srv.Store.User().VerifyEmail(ruser.Id, ruser.Email))
+	_, err = th.App.Srv.Store.User().VerifyEmail(ruser.Id, ruser.Email)
+	require.Nil(t, err)
 
 	user2 := model.User{Email: strings.ToLower(model.NewId()) + "success+test@simulator.amazonses.com", Nickname: "Corey Hulen", Password: "passwd1"}
 	ruser2 := Client.Must(Client.CreateUser(&user2)).(*model.User)
 	th.LinkUserToTeam(ruser2, rteam)
-	store.Must(th.App.Srv.Store.User().VerifyEmail(ruser2.Id, ruser2.Email))
+	_, err = th.App.Srv.Store.User().VerifyEmail(ruser2.Id, ruser2.Email)
+	require.Nil(t, err)
 
 	Client.Login(user.Email, user.Password)