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

2 files changed, 10 insertions, 10 deletions

diff --git a/api/command_loadtest_test.go b/api/command_loadtest_test.go
index a02f4f9d3..46fd985d1 100644
--- a/api/command_loadtest_test.go
+++ b/api/command_loadtest_test.go
@@ -25,8 +25,8 @@ func TestLoadTestHelpCommands(t *testing.T) {
 
 	utils.Cfg.ServiceSettings.EnableTesting = true
 
-	rs := Client.Must(Client.Command(channel.Id, "/loadtest help")).Data.(*model.CommandResponse)
-	if !strings.Contains(rs.Text, "Mattermost load testing commands to help") {
+	rs := Client.Must(Client.Command(channel.Id, "/test help")).Data.(*model.CommandResponse)
+	if !strings.Contains(rs.Text, "Mattermost testing commands to help") {
 		t.Fatal(rs.Text)
 	}
 
@@ -38,7 +38,7 @@ func TestLoadTestSetupCommands(t *testing.T) {
 	Client := th.BasicClient
 	channel := th.BasicChannel
 
-	// enable testing to use /loadtest but don't save it since we don't want to overwrite config.json
+	// enable testing to use /test but don't save it since we don't want to overwrite config.json
 	enableTesting := utils.Cfg.ServiceSettings.EnableTesting
 	defer func() {
 		utils.Cfg.ServiceSettings.EnableTesting = enableTesting
@@ -46,7 +46,7 @@ func TestLoadTestSetupCommands(t *testing.T) {
 
 	utils.Cfg.ServiceSettings.EnableTesting = true
 
-	rs := Client.Must(Client.Command(channel.Id, "/loadtest setup fuzz 1 1 1")).Data.(*model.CommandResponse)
+	rs := Client.Must(Client.Command(channel.Id, "/test setup fuzz 1 1 1")).Data.(*model.CommandResponse)
 	if rs.Text != "Created enviroment" {
 		t.Fatal(rs.Text)
 	}
@@ -59,7 +59,7 @@ func TestLoadTestUsersCommands(t *testing.T) {
 	Client := th.BasicClient
 	channel := th.BasicChannel
 
-	// enable testing to use /loadtest but don't save it since we don't want to overwrite config.json
+	// enable testing to use /test but don't save it since we don't want to overwrite config.json
 	enableTesting := utils.Cfg.ServiceSettings.EnableTesting
 	defer func() {
 		utils.Cfg.ServiceSettings.EnableTesting = enableTesting
@@ -67,7 +67,7 @@ func TestLoadTestUsersCommands(t *testing.T) {
 
 	utils.Cfg.ServiceSettings.EnableTesting = true
 
-	rs := Client.Must(Client.Command(channel.Id, "/loadtest users fuzz 1 2")).Data.(*model.CommandResponse)
+	rs := Client.Must(Client.Command(channel.Id, "/test users fuzz 1 2")).Data.(*model.CommandResponse)
 	if rs.Text != "Added users" {
 		t.Fatal(rs.Text)
 	}
@@ -88,7 +88,7 @@ func TestLoadTestChannelsCommands(t *testing.T) {
 
 	utils.Cfg.ServiceSettings.EnableTesting = true
 
-	rs := Client.Must(Client.Command(channel.Id, "/loadtest channels fuzz 1 2")).Data.(*model.CommandResponse)
+	rs := Client.Must(Client.Command(channel.Id, "/test channels fuzz 1 2")).Data.(*model.CommandResponse)
 	if rs.Text != "Added channels" {
 		t.Fatal(rs.Text)
 	}
@@ -109,7 +109,7 @@ func TestLoadTestPostsCommands(t *testing.T) {
 
 	utils.Cfg.ServiceSettings.EnableTesting = true
 
-	rs := Client.Must(Client.Command(channel.Id, "/loadtest posts fuzz 2 3 2")).Data.(*model.CommandResponse)
+	rs := Client.Must(Client.Command(channel.Id, "/test posts fuzz 2 3 2")).Data.(*model.CommandResponse)
 	if rs.Text != "Added posts" {
 		t.Fatal(rs.Text)
 	}
diff --git a/api/command_test.go b/api/command_test.go
index 6207e6cf5..9e6696d64 100644
--- a/api/command_test.go
+++ b/api/command_test.go
@@ -241,12 +241,12 @@ func TestTestCommand(t *testing.T) {
 	cmd1 := &model.Command{
 		URL:     "http://localhost" + utils.Cfg.ServiceSettings.ListenAddress + model.API_URL_SUFFIX_V3 + "/teams/command_test",
 		Method:  model.COMMAND_METHOD_POST,
-		Trigger: "test",
+		Trigger: "testcommand",
 	}
 
 	cmd1 = Client.Must(Client.CreateCommand(cmd1)).Data.(*model.Command)
 
-	r1 := Client.Must(Client.Command(channel1.Id, "/test")).Data.(*model.CommandResponse)
+	r1 := Client.Must(Client.Command(channel1.Id, "/testcommand")).Data.(*model.CommandResponse)
 	if r1 == nil {
 		t.Fatal("Test command failed to execute")
 	}