Skip to content

Commit 1336e28

Browse files
committed
allow skipping outputs
1 parent 792cbb6 commit 1336e28

File tree

2 files changed

+12
-6
lines changed

2 files changed

+12
-6
lines changed

coderd/authzquery/methods_test.go

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -146,10 +146,14 @@ MethodLoop:
146146
outputs, err := splitResp(t, resp)
147147
require.NoError(t, err, "method %q returned an error", testName)
148148

149-
// Also assert the required outputs
150-
require.Equal(t, len(testCase.ExpectedOutputs), len(outputs), "method %q returned unexpected number of outputs", testName)
151-
for i := range outputs {
152-
require.Equal(t, testCase.ExpectedOutputs[i].Interface(), outputs[i].Interface(), "method %q returned unexpected output %d", testName, i)
149+
// Some tests may not care about the outputs, so we only assert if
150+
// they are provided.
151+
if testCase.ExpectedOutputs != nil {
152+
// Assert the required outputs
153+
require.Equal(t, len(testCase.ExpectedOutputs), len(outputs), "method %q returned unexpected number of outputs", testName)
154+
for i := range outputs {
155+
require.Equal(t, testCase.ExpectedOutputs[i].Interface(), outputs[i].Interface(), "method %q returned unexpected output %d", testName, i)
156+
}
153157
}
154158

155159
found = true

coderd/authzquery/user_test.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,14 +60,16 @@ func (s *MethodTestSuite) TestUser() {
6060
s.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
6161
a := dbgen.User(t, db, database.User{})
6262
b := dbgen.User(t, db, database.User{})
63-
return methodCase(values(database.GetUsersParams{}), asserts(a, rbac.ActionRead, b, rbac.ActionRead))
63+
return methodCase(values(database.GetUsersParams{}),
64+
asserts(a, rbac.ActionRead, b, rbac.ActionRead),
65+
values([]database.User{a, b}))
6466
})
6567
})
6668
s.Run("GetUsersWithCount", func() {
6769
s.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
6870
a := dbgen.User(t, db, database.User{})
6971
b := dbgen.User(t, db, database.User{})
70-
return methodCase(values(database.GetUsersParams{}), asserts(a, rbac.ActionRead, b, rbac.ActionRead))
72+
return methodCase(values(database.GetUsersParams{}), asserts(a, rbac.ActionRead, b, rbac.ActionRead), nil)
7173
})
7274
})
7375
s.Run("GetUsersByIDs", func() {

0 commit comments

Comments
 (0)