From 75c4fcb87eb68ee5317ed25165eeae95b6fba247 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rodrigo=20Villablanca=20V=C3=A1squez?= Date: Tue, 26 Nov 2019 08:36:51 -0300 Subject: [PATCH] MM-17006: An http 404 response code is returned when deleting a non existent plugin (#11631) Automatic Merge --- api4/plugin_test.go | 4 ++-- app/plugin.go | 2 +- app/plugin_statuses.go | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/api4/plugin_test.go b/api4/plugin_test.go index 8934ac4c87..87db556d88 100644 --- a/api4/plugin_test.go +++ b/api4/plugin_test.go @@ -181,11 +181,11 @@ func TestPlugin(t *testing.T) { // Activate error case ok, resp = th.SystemAdminClient.EnablePlugin("junk") - CheckBadRequestStatus(t, resp) + CheckNotFoundStatus(t, resp) assert.False(t, ok) ok, resp = th.SystemAdminClient.EnablePlugin("JUNK") - CheckBadRequestStatus(t, resp) + CheckNotFoundStatus(t, resp) assert.False(t, ok) // Successful deactivate diff --git a/app/plugin.go b/app/plugin.go index 4440e9a3fa..90fad124c7 100644 --- a/app/plugin.go +++ b/app/plugin.go @@ -334,7 +334,7 @@ func (a *App) EnablePlugin(id string) *model.AppError { } if manifest == nil { - return model.NewAppError("EnablePlugin", "app.plugin.not_installed.app_error", nil, "", http.StatusBadRequest) + return model.NewAppError("EnablePlugin", "app.plugin.not_installed.app_error", nil, "", http.StatusNotFound) } a.UpdateConfig(func(cfg *model.Config) { diff --git a/app/plugin_statuses.go b/app/plugin_statuses.go index fe397dd846..9733ac48db 100644 --- a/app/plugin_statuses.go +++ b/app/plugin_statuses.go @@ -28,7 +28,7 @@ func (a *App) GetPluginStatus(id string) (*model.PluginStatus, *model.AppError) return status, nil } } - return nil, model.NewAppError("GetPluginStatus", "app.plugin.not_installed.app_error", nil, "", http.StatusBadRequest) + return nil, model.NewAppError("GetPluginStatus", "app.plugin.not_installed.app_error", nil, "", http.StatusNotFound) } // GetPluginStatuses returns the status for plugins installed on this server.