Skip to content

Commit 5bb5d1f

Browse files
SasSwartSasSwart
committed
fix tests
1 parent 97cb13d commit 5bb5d1f

File tree

1 file changed

+8
-13
lines changed

1 file changed

+8
-13
lines changed

‎coderd/database/dbauthz/dbauthz_test.go

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -860,7 +860,6 @@ func (s *MethodTestSuite) TestOrganization() {
860860
rbac.ResourceOrganizationMember.InOrg(o.ID).WithID(u.ID), policy.ActionCreate)
861861
}))
862862
s.Run("InsertPreset", s.Subtest(func(db database.Store, check *expects) {
863-
ctx := context.Background()
864863
org := dbgen.Organization(s.T(), db, database.Organization{})
865864
user := dbgen.User(s.T(), db, database.User{})
866865
template := dbgen.Template(s.T(), db, database.Template{
@@ -891,8 +890,6 @@ func (s *MethodTestSuite) TestOrganization() {
891890
TemplateVersionID: workspaceBuild.TemplateVersionID,
892891
Name: "test",
893892
}
894-
_, err := db.InsertPreset(ctx, insertPresetParams)
895-
require.NoError(s.T(), err)
896893
check.Args(insertPresetParams).Asserts(rbac.ResourceTemplate, policy.ActionUpdate)
897894
}))
898895
s.Run("InsertPresetParameters", s.Subtest(func(db database.Store, check *expects) {
@@ -932,8 +929,6 @@ func (s *MethodTestSuite) TestOrganization() {
932929
Names: []string{"test"},
933930
Values: []string{"test"},
934931
}
935-
_, err = db.InsertPresetParameters(context.Background(), insertPresetParametersParams)
936-
require.NoError(s.T(), err)
937932
check.Args(insertPresetParametersParams).Asserts(rbac.ResourceTemplate, policy.ActionUpdate)
938933
}))
939934
s.Run("DeleteOrganizationMember", s.Subtest(func(db database.Store, check *expects) {
@@ -3741,7 +3736,7 @@ func (s *MethodTestSuite) TestSystemFunctions() {
37413736
s.Run("GetProvisionerJobsCreatedAfter", s.Subtest(func(db database.Store, check *expects) {
37423737
// TODO: add provisioner job resource type
37433738
_ = dbgen.ProvisionerJob(s.T(), db, nil, database.ProvisionerJob{CreatedAt: time.Now().Add(-time.Hour)})
3744-
check.Args(time.Now()).Asserts( /*rbac.ResourceSystem, policy.ActionRead*/ )
3739+
check.Args(time.Now()).Asserts( /*rbac.ResourceSystem, policy.ActionRead*/)
37453740
}))
37463741
s.Run("GetTemplateVersionsByIDs", s.Subtest(func(db database.Store, check *expects) {
37473742
dbtestutil.DisableForeignKeysAndTriggers(s.T(), db)
@@ -3920,7 +3915,7 @@ func (s *MethodTestSuite) TestSystemFunctions() {
39203915
a := dbgen.ProvisionerJob(s.T(), db, nil, database.ProvisionerJob{})
39213916
b := dbgen.ProvisionerJob(s.T(), db, nil, database.ProvisionerJob{})
39223917
check.Args([]uuid.UUID{a.ID, b.ID}).
3923-
Asserts( /*rbac.ResourceSystem, policy.ActionRead*/ ).
3918+
Asserts( /*rbac.ResourceSystem, policy.ActionRead*/).
39243919
Returns(slice.New(a, b))
39253920
}))
39263921
s.Run("InsertWorkspaceAgent", s.Subtest(func(db database.Store, check *expects) {
@@ -3964,22 +3959,22 @@ func (s *MethodTestSuite) TestSystemFunctions() {
39643959
OrganizationID: j.OrganizationID,
39653960
Types: []database.ProvisionerType{j.Provisioner},
39663961
ProvisionerTags: must(json.Marshal(j.Tags)),
3967-
}).Asserts( /*rbac.ResourceSystem, policy.ActionUpdate*/ )
3962+
}).Asserts( /*rbac.ResourceSystem, policy.ActionUpdate*/)
39683963
}))
39693964
s.Run("UpdateProvisionerJobWithCompleteByID", s.Subtest(func(db database.Store, check *expects) {
39703965
// TODO: we need to create a ProvisionerJob resource
39713966
j := dbgen.ProvisionerJob(s.T(), db, nil, database.ProvisionerJob{})
39723967
check.Args(database.UpdateProvisionerJobWithCompleteByIDParams{
39733968
ID: j.ID,
3974-
}).Asserts( /*rbac.ResourceSystem, policy.ActionUpdate*/ )
3969+
}).Asserts( /*rbac.ResourceSystem, policy.ActionUpdate*/)
39753970
}))
39763971
s.Run("UpdateProvisionerJobByID", s.Subtest(func(db database.Store, check *expects) {
39773972
// TODO: we need to create a ProvisionerJob resource
39783973
j := dbgen.ProvisionerJob(s.T(), db, nil, database.ProvisionerJob{})
39793974
check.Args(database.UpdateProvisionerJobByIDParams{
39803975
ID: j.ID,
39813976
UpdatedAt: time.Now(),
3982-
}).Asserts( /*rbac.ResourceSystem, policy.ActionUpdate*/ )
3977+
}).Asserts( /*rbac.ResourceSystem, policy.ActionUpdate*/)
39833978
}))
39843979
s.Run("InsertProvisionerJob", s.Subtest(func(db database.Store, check *expects) {
39853980
dbtestutil.DisableForeignKeysAndTriggers(s.T(), db)
@@ -3990,21 +3985,21 @@ func (s *MethodTestSuite) TestSystemFunctions() {
39903985
StorageMethod: database.ProvisionerStorageMethodFile,
39913986
Type: database.ProvisionerJobTypeWorkspaceBuild,
39923987
Input: json.RawMessage("{}"),
3993-
}).Asserts( /*rbac.ResourceSystem, policy.ActionCreate*/ )
3988+
}).Asserts( /*rbac.ResourceSystem, policy.ActionCreate*/)
39943989
}))
39953990
s.Run("InsertProvisionerJobLogs", s.Subtest(func(db database.Store, check *expects) {
39963991
// TODO: we need to create a ProvisionerJob resource
39973992
j := dbgen.ProvisionerJob(s.T(), db, nil, database.ProvisionerJob{})
39983993
check.Args(database.InsertProvisionerJobLogsParams{
39993994
JobID: j.ID,
4000-
}).Asserts( /*rbac.ResourceSystem, policy.ActionCreate*/ )
3995+
}).Asserts( /*rbac.ResourceSystem, policy.ActionCreate*/)
40013996
}))
40023997
s.Run("InsertProvisionerJobTimings", s.Subtest(func(db database.Store, check *expects) {
40033998
// TODO: we need to create a ProvisionerJob resource
40043999
j := dbgen.ProvisionerJob(s.T(), db, nil, database.ProvisionerJob{})
40054000
check.Args(database.InsertProvisionerJobTimingsParams{
40064001
JobID: j.ID,
4007-
}).Asserts( /*rbac.ResourceSystem, policy.ActionCreate*/ )
4002+
}).Asserts( /*rbac.ResourceSystem, policy.ActionCreate*/)
40084003
}))
40094004
s.Run("UpsertProvisionerDaemon", s.Subtest(func(db database.Store, check *expects) {
40104005
dbtestutil.DisableForeignKeysAndTriggers(s.T(), db)

0 commit comments

Comments
 (0)