1 files changed, 12 insertions, 32 deletions

diff --git a/api/web_socket_test.go b/api/web_socket_test.go
index 2c0ac61eb..7cb04e93e 100644
--- a/api/web_socket_test.go
+++ b/api/web_socket_test.go
@@ -6,7 +6,6 @@ package api
 import (
 	"github.com/gorilla/websocket"
 	"github.com/mattermost/platform/model"
-	"github.com/mattermost/platform/store"
 	"github.com/mattermost/platform/utils"
 	"net/http"
 	"testing"
@@ -14,22 +13,14 @@ import (
 )
 
 func TestSocket(t *testing.T) {
-	Setup()
+	th := Setup().InitBasic()
+	Client := th.BasicClient
+	team := th.BasicTeam
+	channel1 := th.BasicChannel
+	channel2 := th.CreateChannel(Client, team)
+	Client.Must(Client.AddChannelMember(channel1.Id, th.BasicUser2.Id))
 
-	url := "ws://localhost" + utils.Cfg.ServiceSettings.ListenAddress + "/api/v1/websocket"
-	team := &model.Team{DisplayName: "Name", Name: "z-z-" + model.NewId() + "a", Email: "test@nowhere.com", Type: model.TEAM_OPEN}
-	team = Client.Must(Client.CreateTeam(team)).Data.(*model.Team)
-
-	user1 := &model.User{TeamId: team.Id, Email: model.NewId() + "success+test@simulator.amazonses.com", Nickname: "Corey Hulen", Password: "pwd"}
-	user1 = Client.Must(Client.CreateUser(user1, "")).Data.(*model.User)
-	store.Must(Srv.Store.User().VerifyEmail(user1.Id))
-	Client.LoginByEmail(team.Name, user1.Email, "pwd")
-
-	channel1 := &model.Channel{DisplayName: "Test Web Scoket 1", Name: "a" + model.NewId() + "a", Type: model.CHANNEL_OPEN, TeamId: team.Id}
-	channel1 = Client.Must(Client.CreateChannel(channel1)).Data.(*model.Channel)
-
-	channel2 := &model.Channel{DisplayName: "Test Web Scoket 2", Name: "a" + model.NewId() + "a", Type: model.CHANNEL_OPEN, TeamId: team.Id}
-	channel2 = Client.Must(Client.CreateChannel(channel2)).Data.(*model.Channel)
+	url := "ws://localhost" + utils.Cfg.ServiceSettings.ListenAddress + model.API_URL_SUFFIX + "/users/websocket"
 
 	header1 := http.Header{}
 	header1.Set(model.HEADER_AUTH, "BEARER "+Client.AuthToken)
@@ -39,10 +30,7 @@ func TestSocket(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	user2 := &model.User{TeamId: team.Id, Email: model.NewId() + "success+test@simulator.amazonses.com", Nickname: "Corey Hulen", Password: "pwd"}
-	user2 = Client.Must(Client.CreateUser(user2, "")).Data.(*model.User)
-	store.Must(Srv.Store.User().VerifyEmail(user2.Id))
-	Client.LoginByEmail(team.Name, user2.Email, "pwd")
+	th.LoginBasic2()
 
 	header2 := http.Header{}
 	header2.Set(model.HEADER_AUTH, "BEARER "+Client.AuthToken)
@@ -53,21 +41,11 @@ func TestSocket(t *testing.T) {
 	}
 
 	time.Sleep(300 * time.Millisecond)
-	Client.Must(Client.JoinChannel(channel1.Id))
 
-	// Read the user_added message that gets generated
 	var rmsg model.Message
-	if err := c2.ReadJSON(&rmsg); err != nil {
-		t.Fatal(err)
-	}
-
-	// Read the second user_added message that gets generated
-	if err := c2.ReadJSON(&rmsg); err != nil {
-		t.Fatal(err)
-	}
 
 	// Test sending message without a channelId
-	m := model.NewMessage("", "", "", model.ACTION_TYPING)
+	m := model.NewMessage(team.Id, "", "", model.ACTION_TYPING)
 	m.Add("RootId", model.NewId())
 	m.Add("ParentId", model.NewId())
 
@@ -77,6 +55,8 @@ func TestSocket(t *testing.T) {
 		t.Fatal(err)
 	}
 
+	t.Log(rmsg.ToJson())
+
 	if team.Id != rmsg.TeamId {
 		t.Fatal("Ids do not match")
 	}
@@ -86,7 +66,7 @@ func TestSocket(t *testing.T) {
 	}
 
 	// Test sending messsage to Channel you have access to
-	m = model.NewMessage("", channel1.Id, "", model.ACTION_TYPING)
+	m = model.NewMessage(team.Id, channel1.Id, "", model.ACTION_TYPING)
 	m.Add("RootId", model.NewId())
 	m.Add("ParentId", model.NewId())