IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Chore: Refactor GoConvey in the guardian package (#40898)

Browse Source
This commit is contained in:
Serge Zaitsev 2021-10-27 14:45:20 +02:00 committed by GitHub
parent f6a9132975
commit 00da702970
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkg/services/guardian/guardian_test.go
View File

@ -10,7 +10,7 @@ import (
"github.com/grafana/grafana/pkg/bus"
"github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/setting"
. "github.com/smartystreets/goconvey/convey"
"github.com/stretchr/testify/require"
)
@ -681,7 +681,7 @@ func (sc *scenarioContext) verifyUpdateChildDashboardPermissionsWithOverrideShou
}
func TestGuardianGetHiddenACL(t *testing.T) {
Convey("Get hidden ACL tests", t, func() {
t.Run("Get hidden ACL tests", func(t *testing.T) {
bus.ClearBusHandlers()
bus.AddHandler("test", func(query *models.GetDashboardAclInfoListQuery) error {
@ -696,7 +696,7 @@ func TestGuardianGetHiddenACL(t *testing.T) {
cfg := setting.NewCfg()
cfg.HiddenUsers = map[string]struct{}{"user2": {}}
Convey("Should get hidden acl", func() {
t.Run("Should get hidden acl", func(t *testing.T) {
user := &models.SignedInUser{
OrgId: orgID,
UserId: 1,
@ -705,13 +705,13 @@ func TestGuardianGetHiddenACL(t *testing.T) {
g := New(context.Background(), dashboardID, orgID, user)
hiddenACL, err := g.GetHiddenACL(cfg)
So(err, ShouldBeNil)
require.NoError(t, err)
So(hiddenACL, ShouldHaveLength, 1)
So(hiddenACL[0].UserID, ShouldEqual, 2)
require.Equal(t, len(hiddenACL), 1)
require.Equal(t, hiddenACL[0].UserID, int64(2))
})
Convey("Grafana admin should not get hidden acl", func() {
t.Run("Grafana admin should not get hidden acl", func(t *testing.T) {
user := &models.SignedInUser{
OrgId: orgID,
UserId: 1,
@ -721,9 +721,9 @@ func TestGuardianGetHiddenACL(t *testing.T) {
g := New(context.Background(), dashboardID, orgID, user)
hiddenACL, err := g.GetHiddenACL(cfg)
So(err, ShouldBeNil)
require.NoError(t, err)
So(hiddenACL, ShouldHaveLength, 0)
require.Equal(t, len(hiddenACL), 0)
})
})
}