summaryrefslogtreecommitdiffstats
path: root/api/channel_test.go
diff options
context:
space:
mode:
authorHarrison Healey <harrisonmhealey@gmail.com>2016-06-06 13:03:56 -0400
committerHarrison Healey <harrisonmhealey@gmail.com>2016-06-06 13:03:56 -0400
commit384d0eb245e2aa325fdcfe2d8ee22a40c91af589 (patch)
treec61bbf3241625d766fa81fbebf7395db3ef3521d /api/channel_test.go
parent2c42294bbcab3cd5cfdce9604e5872fe4a12e538 (diff)
downloadchat-384d0eb245e2aa325fdcfe2d8ee22a40c91af589.tar.gz
chat-384d0eb245e2aa325fdcfe2d8ee22a40c91af589.tar.bz2
chat-384d0eb245e2aa325fdcfe2d8ee22a40c91af589.zip
PLT-2559 Always return successful when trying to join a channel that the user is already a member of (#3265)
* Added unit tests for SqlChannelStore.GetMember * Fixed api routes for accessing channels by name when the name includes an underscore * Changed join channel API to always return successful when the user is already a member of the channel
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) {