From 124fb743e8d9edfdaf58559e1925dc4a6dd13489 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hugo=20H=C3=A4ggmark?= <hugo.haggmark@grafana.com>
Date: Wed, 6 Mar 2019 08:09:34 +0100
Subject: [PATCH] teams: make test cases pass again

---
 pkg/api/dashboard_test.go |  4 ++++
 pkg/api/folder_test.go    | 11 ++++++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/pkg/api/dashboard_test.go b/pkg/api/dashboard_test.go
index 923bf57ce8a..d58e2246eec 100644
--- a/pkg/api/dashboard_test.go
+++ b/pkg/api/dashboard_test.go
@@ -972,8 +972,12 @@ func postDashboardScenario(desc string, url string, routePattern string, mock *d
 	Convey(desc+" "+url, func() {
 		defer bus.ClearBusHandlers()
 
+		cfg := setting.NewCfg()
+		cfg.EditorsCanOwn = false
+
 		hs := HTTPServer{
 			Bus: bus.GetBus(),
+			Cfg: cfg,
 		}
 
 		sc := setupScenarioContext(url)
diff --git a/pkg/api/folder_test.go b/pkg/api/folder_test.go
index 880de338c8f..914acf5797e 100644
--- a/pkg/api/folder_test.go
+++ b/pkg/api/folder_test.go
@@ -9,6 +9,7 @@ import (
 	"github.com/grafana/grafana/pkg/bus"
 	m "github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/services/dashboards"
+	"github.com/grafana/grafana/pkg/setting"
 
 	. "github.com/smartystreets/goconvey/convey"
 )
@@ -141,12 +142,20 @@ func createFolderScenario(desc string, url string, routePattern string, mock *fa
 	Convey(desc+" "+url, func() {
 		defer bus.ClearBusHandlers()
 
+		cfg := setting.NewCfg()
+		cfg.EditorsCanOwn = false
+
+		hs := HTTPServer{
+			Bus: bus.GetBus(),
+			Cfg: cfg,
+		}
+
 		sc := setupScenarioContext(url)
 		sc.defaultHandler = Wrap(func(c *m.ReqContext) Response {
 			sc.context = c
 			sc.context.SignedInUser = &m.SignedInUser{OrgId: TestOrgID, UserId: TestUserID}
 
-			return CreateFolder(c, cmd)
+			return hs.CreateFolder(c, cmd)
 		})
 
 		origNewFolderService := dashboards.NewFolderService