summaryrefslogtreecommitdiffstats
path: root/web
diff options
context:
space:
mode:
authorGeorge Goldberg <george@gberg.me>2017-04-04 18:19:42 +0100
committerGitHub <noreply@github.com>2017-04-04 18:19:42 +0100
commit32460bf63bc07c69ee5da0bb5640b879facb5538 (patch)
tree2ee6abc94175823632e9f9ab40172948fcfa0f85 /web
parent0b5c0794fdcbb551c1233dcdfbdf5c7deb585fd6 (diff)
downloadchat-32460bf63bc07c69ee5da0bb5640b879facb5538.tar.gz
chat-32460bf63bc07c69ee5da0bb5640b879facb5538.tar.bz2
chat-32460bf63bc07c69ee5da0bb5640b879facb5538.zip
PLT-6198: Use added to channel system message on default channels. (#5969)
Use a different sytem message when a user was added to a default channel by someone else than when they joined themselves.
Diffstat (limited to 'web')
-rw-r--r--web/web_test.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/web/web_test.go b/web/web_test.go
index a977a113e..0e5353d19 100644
--- a/web/web_test.go
+++ b/web/web_test.go
@@ -72,7 +72,7 @@ func TestIncomingWebhook(t *testing.T) {
team := &model.Team{DisplayName: "Name", Name: "z-z-" + model.NewId() + "a", Email: "test@nowhere.com", Type: model.TEAM_OPEN}
team = ApiClient.Must(ApiClient.CreateTeam(team)).Data.(*model.Team)
- app.JoinUserToTeam(team, user)
+ app.JoinUserToTeam(team, user, "")
app.UpdateUserRoles(user.Id, model.ROLE_SYSTEM_ADMIN.Id)
ApiClient.SetTeamId(team.Id)