From ba998db0998e7782842e4f86a242edd1e52b5e97 Mon Sep 17 00:00:00 2001
From: JoramWilander <jwawilander@gmail.com>
Date: Mon, 29 Jun 2015 11:14:12 -0400
Subject: update unit tests for default channels

---
 api/channel_test.go | 11 +++++++++--
 api/command_test.go |  2 +-
 api/team_test.go    | 16 ++++++++++++++++
 3 files changed, 26 insertions(+), 3 deletions(-)

(limited to 'api')

diff --git a/api/channel_test.go b/api/channel_test.go
index 2e2e3683a..dfae840dc 100644
--- a/api/channel_test.go
+++ b/api/channel_test.go
@@ -35,8 +35,15 @@ func TestCreateChannel(t *testing.T) {
 	}
 
 	rget := Client.Must(Client.GetChannels("")).Data.(*model.ChannelList)
-	if rget.Channels[0].Name != channel.Name {
-		t.Fatal("full name didn't match")
+	nameMatch := false
+	for _, c := range rget.Channels {
+		if c.Name == channel.Name {
+			nameMatch = true
+		}
+	}
+
+	if !nameMatch {
+		t.Fatal("Did not create channel with correct name")
 	}
 
 	if _, err := Client.CreateChannel(rchannel.Data.(*model.Channel)); err == nil {
diff --git a/api/command_test.go b/api/command_test.go
index d3b0da455..5b7734628 100644
--- a/api/command_test.go
+++ b/api/command_test.go
@@ -129,7 +129,7 @@ func TestJoinCommands(t *testing.T) {
 
 	c1 := Client.Must(Client.GetChannels("")).Data.(*model.ChannelList)
 
-	if len(c1.Channels) != 3 { // 3 because of town-square and direct
+	if len(c1.Channels) != 4 { // 4 because of town-square, off-topic and direct
 		t.Fatal("didn't join channel")
 	}
 
diff --git a/api/team_test.go b/api/team_test.go
index 042c0a2e9..bb77d43a0 100644
--- a/api/team_test.go
+++ b/api/team_test.go
@@ -55,6 +55,11 @@ func TestCreateFromSignupTeam(t *testing.T) {
 		}
 	}
 
+	c1 := Client.Must(Client.GetChannels("")).Data.(*model.ChannelList)
+	if len(c1.Channels) != 2 {
+		t.Fatal("default channels not created")
+	}
+
 	ts.Data = "garbage"
 	_, err = Client.CreateTeamFromSignup(&ts)
 	if err == nil {
@@ -71,6 +76,17 @@ func TestCreateTeam(t *testing.T) {
 		t.Fatal(err)
 	}
 
+	user := &model.User{TeamId: rteam.Data.(*model.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)
+
+	Client.LoginByEmail(team.Domain, user.Email, "pwd")
+
+	c1 := Client.Must(Client.GetChannels("")).Data.(*model.ChannelList)
+	if len(c1.Channels) != 2 {
+		t.Fatal("default channels not created")
+	}
+
 	if rteam.Data.(*model.Team).Name != team.Name {
 		t.Fatal("full name didn't match")
 	}
-- 
cgit v1.2.3-1-g7c22