FeatureFlags: define features outside settings.Cfg (take 3) (#44443)

pkg/api/org_users_test.go

@@ -16,6 +16,7 @@ import (
 	"github.com/grafana/grafana/pkg/components/simplejson"
 	"github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/services/accesscontrol"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/services/sqlstore"
 	"github.com/grafana/grafana/pkg/setting"
 	"github.com/grafana/grafana/pkg/util"
@@ -34,8 +35,8 @@ func setUpGetOrgUsersDB(t *testing.T, sqlStore *sqlstore.SQLStore) {
 }
 
 func TestOrgUsersAPIEndpoint_userLoggedIn(t *testing.T) {
-	settings := setting.NewCfg()
-	hs := &HTTPServer{Cfg: settings}
+	hs := setupSimpleHTTPServer(featuremgmt.WithFeatures())
+	settings := hs.Cfg
 
 	sqlStore := sqlstore.InitTestDB(t)
 	sqlStore.Cfg = settings