summaryrefslogtreecommitdiffstats
path: root/api/channel_test.go
diff options
context:
space:
mode:
Diffstat (limited to 'api/channel_test.go')
-rw-r--r--api/channel_test.go32
1 files changed, 30 insertions, 2 deletions
diff --git a/api/channel_test.go b/api/channel_test.go
index 175b0a14a..5c51e4d93 100644
--- a/api/channel_test.go
+++ b/api/channel_test.go
@@ -462,11 +462,25 @@ func TestJoinChannelById(t *testing.T) {
user3 := th.CreateUser(th.BasicClient)
LinkUserToTeam(user3, team)
- Client.Login(user3.Email, "pwd")
+ Client.Must(Client.Login(user3.Email, "Password1"))
if _, err := Client.JoinChannel(rchannel.Id); err == nil {
t.Fatal("shoudn't be able to join direct channel")
}
+
+ th.LoginBasic()
+
+ if _, err := Client.JoinChannel(channel1.Id); err != nil {
+ t.Fatal("should be able to join public channel that we're a member of")
+ }
+
+ if _, err := Client.JoinChannel(channel3.Id); err != nil {
+ t.Fatal("should be able to join private channel that we're a member of")
+ }
+
+ if _, err := Client.JoinChannel(rchannel.Id); err != nil {
+ t.Fatal("should be able to join direct channel that we're a member of")
+ }
}
func TestJoinChannelByName(t *testing.T) {
@@ -492,11 +506,25 @@ func TestJoinChannelByName(t *testing.T) {
user3 := th.CreateUser(th.BasicClient)
LinkUserToTeam(user3, team)
- Client.Login(user3.Email, "pwd")
+ Client.Must(Client.Login(user3.Email, "Password1"))
if _, err := Client.JoinChannelByName(rchannel.Name); err == nil {
t.Fatal("shoudn't be able to join direct channel")
}
+
+ th.LoginBasic()
+
+ if _, err := Client.JoinChannelByName(channel1.Name); err != nil {
+ t.Fatal("should be able to join public channel that we're a member of")
+ }
+
+ if _, err := Client.JoinChannelByName(channel3.Name); err != nil {
+ t.Fatal("should be able to join private channel that we're a member of")
+ }
+
+ if _, err := Client.JoinChannelByName(rchannel.Name); err != nil {
+ t.Fatal("should be able to join direct channel that we're a member of")
+ }
}
func TestLeaveChannel(t *testing.T) {