From a0bfd2885d03e3f9fb6b3cdd6ba60eea93c848b2 Mon Sep 17 00:00:00 2001
From: Joram Wilander <jwawilander@gmail.com>
Date: Thu, 26 Oct 2017 13:21:35 -0400
Subject: Add config setting to configure plugins directory (#7725)

---
 api4/plugin_test.go | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'api4/plugin_test.go')

diff --git a/api4/plugin_test.go b/api4/plugin_test.go
index 48ee4fb74..0c39b2a89 100644
--- a/api4/plugin_test.go
+++ b/api4/plugin_test.go
@@ -5,6 +5,7 @@ package api4
 
 import (
 	"bytes"
+	"encoding/json"
 	"io/ioutil"
 	"os"
 	"testing"
@@ -29,11 +30,16 @@ func TestPlugin(t *testing.T) {
 
 	enablePlugins := *th.App.Config().PluginSettings.Enable
 	enableUploadPlugins := *th.App.Config().PluginSettings.EnableUploads
+	statesJson, _ := json.Marshal(th.App.Config().PluginSettings.PluginStates)
+	states := map[string]*model.PluginState{}
+	json.Unmarshal(statesJson, &states)
 	defer func() {
 		th.App.UpdateConfig(func(cfg *model.Config) {
 			*cfg.PluginSettings.Enable = enablePlugins
 			*cfg.PluginSettings.EnableUploads = enableUploadPlugins
+			cfg.PluginSettings.PluginStates = states
 		})
+		th.App.SaveConfig(th.App.Config(), false)
 	}()
 	th.App.UpdateConfig(func(cfg *model.Config) {
 		*cfg.PluginSettings.Enable = true
@@ -101,11 +107,6 @@ func TestPlugin(t *testing.T) {
 
 	assert.False(t, found)
 
-	states := th.App.Config().PluginSettings.PluginStates
-	defer func() {
-		th.App.UpdateConfig(func(cfg *model.Config) { cfg.PluginSettings.PluginStates = states })
-	}()
-
 	// Successful activate
 	ok, resp := th.SystemAdminClient.ActivatePlugin(manifest.Id)
 	CheckNoError(t, resp)
-- 
cgit v1.2.3-1-g7c22