PluginManager: Make remaining plugin state non-global (#32094)

* PluginDashboards: Use plugin manager interface Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * PluginManager: Make panels non-global Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * PluginManager: Make apps non-global Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * PluginManager: Make static routes non-global Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * PluginManager: Make pluginTypes non-global Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
2021-03-18 13:53:01 +01:00
parent 1454c3723d
commit a2eda798e7
22 changed files with 293 additions and 233 deletions
@@ -7,61 +7,53 @@ import (
 	"github.com/grafana/grafana/pkg/components/simplejson"
 	"github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/setting"
-	. "github.com/smartystreets/goconvey/convey"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )

-func TestPluginDashboards(t *testing.T) {
-	Convey("When asking for plugin dashboard info", t, func() {
-		pm := &PluginManager{
-			Cfg: &setting.Cfg{
-				FeatureToggles: map[string]bool{},
-				PluginSettings: setting.PluginSettings{
-					"test-app": map[string]string{
-						"path": "testdata/test-app",
-					},
-				},
+func TestGetPluginDashboards(t *testing.T) {
+	pm := newManager(&setting.Cfg{
+		FeatureToggles: map[string]bool{},
+		PluginSettings: setting.PluginSettings{
+			"test-app": map[string]string{
+				"path": "testdata/test-app",
 			},
-		}
-		err := pm.Init()
-		So(err, ShouldBeNil)
-
-		bus.AddHandler("test", func(query *models.GetDashboardQuery) error {
-			if query.Slug == "nginx-connections" {
-				dash := models.NewDashboard("Nginx Connections")
-				dash.Data.Set("revision", "1.1")
-				query.Result = dash
-				return nil
-			}
-
-			return models.ErrDashboardNotFound
-		})
-
-		bus.AddHandler("test", func(query *models.GetDashboardsByPluginIdQuery) error {
-			var data = simplejson.New()
-			data.Set("title", "Nginx Connections")
-			data.Set("revision", 22)
-
-			query.Result = []*models.Dashboard{
-				{Slug: "nginx-connections", Data: data},
-			}
-			return nil
-		})
-
-		dashboards, err := pm.GetPluginDashboards(1, "test-app")
-		So(err, ShouldBeNil)
-
-		Convey("should return 2 dashboards", func() {
-			So(len(dashboards), ShouldEqual, 2)
-		})
-
-		Convey("should include installed version info", func() {
-			So(dashboards[0].Title, ShouldEqual, "Nginx Connections")
-			So(dashboards[0].Revision, ShouldEqual, 25)
-			So(dashboards[0].ImportedRevision, ShouldEqual, 22)
-			So(dashboards[0].ImportedUri, ShouldEqual, "db/nginx-connections")
-
-			So(dashboards[1].Revision, ShouldEqual, 2)
-			So(dashboards[1].ImportedRevision, ShouldEqual, 0)
-		})
+		},
 	})
+	err := pm.Init()
+	require.NoError(t, err)
+
+	bus.AddHandler("test", func(query *models.GetDashboardQuery) error {
+		if query.Slug == "nginx-connections" {
+			dash := models.NewDashboard("Nginx Connections")
+			dash.Data.Set("revision", "1.1")
+			query.Result = dash
+			return nil
+		}
+
+		return models.ErrDashboardNotFound
+	})
+
+	bus.AddHandler("test", func(query *models.GetDashboardsByPluginIdQuery) error {
+		var data = simplejson.New()
+		data.Set("title", "Nginx Connections")
+		data.Set("revision", 22)
+
+		query.Result = []*models.Dashboard{
+			{Slug: "nginx-connections", Data: data},
+		}
+		return nil
+	})
+
+	dashboards, err := pm.GetPluginDashboards(1, "test-app")
+	require.NoError(t, err)
+
+	assert.Len(t, dashboards, 2)
+	assert.Equal(t, "Nginx Connections", dashboards[0].Title)
+	assert.Equal(t, int64(25), dashboards[0].Revision)
+	assert.Equal(t, int64(22), dashboards[0].ImportedRevision)
+	assert.Equal(t, "db/nginx-connections", dashboards[0].ImportedUri)
+
+	assert.Equal(t, int64(2), dashboards[1].Revision)
+	assert.Equal(t, int64(0), dashboards[1].ImportedRevision)
 }