summaryrefslogtreecommitdiffstats
path: root/api4/command_test.go
diff options
context:
space:
mode:
authorJoram Wilander <jwawilander@gmail.com>2017-06-15 11:05:43 -0400
committerGitHub <noreply@github.com>2017-06-15 11:05:43 -0400
commit528f2dc6c3b7c7a100d9022f4f50dfe337e92f0c (patch)
tree71fa9b677ce72050dca3abc3c9243e6cf39e0278 /api4/command_test.go
parentc0a0065472c199166d32b052dd328b0212f5b693 (diff)
downloadchat-528f2dc6c3b7c7a100d9022f4f50dfe337e92f0c.tar.gz
chat-528f2dc6c3b7c7a100d9022f4f50dfe337e92f0c.tar.bz2
chat-528f2dc6c3b7c7a100d9022f4f50dfe337e92f0c.zip
Merge release-3.10 into master (#6654)
* PLT-6787 Fixed being able to send a post before files finished uploading (#6617) * Fix quick switcher for channels/users not stored locally (#6610) * Fix button text on confirm mention modal (#6609) * fix post delete permission of channel admin (#6608) * open comment thread for the most recent reply-able message (#6605) * Use mutex flag with yarn to prevent concurrent builds interfering (#6619) * Use mutex flag with yarn to prevent concurrent builds interfering * Remove yarn mutex file with clean * Minor bug fixes (#6615) * PLT-6774 - Fixing color for offline icon * PLT-6784 - Fixing status icon * Fixing icon margin * Updating caret position * PLT-6070 Have ChannelMentionProvider stop searching after a term returns no results (#6620) * Fixing JS error (#6623) * Minor bug fixes (#6622) * PLT-6808 - Updating channel switcher on mobile * PLT-6743 - Updating scrollbar styling * Login instead of failing if user exists in OAuth sign-up flow (#6627) * PLT-6802 Disable team switcher (#6626) * Disable team switcher * Fix ESLint errors * PLT-6807 Ensured select teams page can scroll on iOS (#6630) * Do not redirect from account switch pages on 401 (#6631) * Fixing loadtest command and renaming to /test (#6624) * PLT-6820 Update mattermost-redux dependency (#6632) * translations PR 20170612 (#6629) * Bump HTTP client timeout to 30 seconds (#6633) * For team unreads return empty array instead of null (#6636) * PLT-6831 Fix status modal localization IDs (#6637) * Fix status modal localization IDs * Update test snapshot
Diffstat (limited to 'api4/command_test.go')
-rw-r--r--api4/command_test.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/api4/command_test.go b/api4/command_test.go
index 4bbf20084..467d45955 100644
--- a/api4/command_test.go
+++ b/api4/command_test.go
@@ -47,14 +47,14 @@ func TestCreateCommand(t *testing.T) {
CheckErrorMessage(t, resp, "api.command.duplicate_trigger.app_error")
newCmd.Method = "Wrong"
- newCmd.Trigger = "test"
+ newCmd.Trigger = "testcommand"
_, resp = th.SystemAdminClient.CreateCommand(newCmd)
CheckInternalErrorStatus(t, resp)
CheckErrorMessage(t, resp, "model.command.is_valid.method.app_error")
*utils.Cfg.ServiceSettings.EnableCommands = false
newCmd.Method = "P"
- newCmd.Trigger = "test"
+ newCmd.Trigger = "testcommand"
_, resp = th.SystemAdminClient.CreateCommand(newCmd)
CheckNotImplementedStatus(t, resp)
CheckErrorMessage(t, resp, "api.command.disabled.app_error")