summaryrefslogtreecommitdiffstats
path: root/api/channel_test.go
diff options
context:
space:
mode:
authorJoram Wilander <jwawilander@gmail.com>2016-05-16 12:55:22 -0400
committerChristopher Speller <crspeller@gmail.com>2016-05-16 12:55:22 -0400
commit1f609e9cf799ddb6bedd5fe3c0eeb36b92ed243d (patch)
treef30ee0f416a9a7b5d76070e6a0ff999c08f44f47 /api/channel_test.go
parentc5f105787c7d740eaa9fb01891711a6fb72f7480 (diff)
downloadchat-1f609e9cf799ddb6bedd5fe3c0eeb36b92ed243d.tar.gz
chat-1f609e9cf799ddb6bedd5fe3c0eeb36b92ed243d.tar.bz2
chat-1f609e9cf799ddb6bedd5fe3c0eeb36b92ed243d.zip
Check team member instead of session for team admin role when updating/deleting channels (#3007)
Diffstat (limited to 'api/channel_test.go')
-rw-r--r--api/channel_test.go14
1 files changed, 14 insertions, 0 deletions
diff --git a/api/channel_test.go b/api/channel_test.go
index 6a907b278..ac2766588 100644
--- a/api/channel_test.go
+++ b/api/channel_test.go
@@ -134,6 +134,7 @@ func TestUpdateChannel(t *testing.T) {
team := th.BasicTeam
user := th.BasicUser
user2 := th.CreateUser(th.BasicClient)
+ LinkUserToTeam(user2, team)
channel1 := &model.Channel{DisplayName: "A Test API Name", Name: "a" + model.NewId() + "a", Type: model.CHANNEL_OPEN, TeamId: team.Id}
channel1 = Client.Must(Client.CreateChannel(channel1)).Data.(*model.Channel)
@@ -175,6 +176,13 @@ func TestUpdateChannel(t *testing.T) {
if _, err := Client.UpdateChannel(upChannel1); err == nil {
t.Fatal("Standard User should have failed to update")
}
+
+ Client.Must(Client.JoinChannel(channel1.Id))
+ UpdateUserToTeamAdmin(user2, team)
+
+ if _, err := Client.UpdateChannel(upChannel1); err != nil {
+ t.Fatal(err)
+ }
}
func TestUpdateChannelHeader(t *testing.T) {
@@ -566,6 +574,12 @@ func TestDeleteChannel(t *testing.T) {
break
}
}
+
+ UpdateUserToTeamAdmin(userStd, team)
+
+ if _, err := Client.DeleteChannel(channel2.Id); err != nil {
+ t.Fatal(err)
+ }
}
func TestGetChannelExtraInfo(t *testing.T) {