From 00da702970fe185c3627a97f2b68981ff792c61a Mon Sep 17 00:00:00 2001 From: Serge Zaitsev Date: Wed, 27 Oct 2021 14:45:20 +0200 Subject: [PATCH] Chore: Refactor GoConvey in the guardian package (#40898) --- pkg/services/guardian/guardian_test.go | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkg/services/guardian/guardian_test.go b/pkg/services/guardian/guardian_test.go index a46a198dad3..1d746ff0bd9 100644 --- a/pkg/services/guardian/guardian_test.go +++ b/pkg/services/guardian/guardian_test.go @@ -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) }) }) }