dbauthz: allow asserting errors in tests

johnstcn · Emyrk · commit a876975e3eb9 · 2023-12-15T11:27:02.000-06:00
diff --git a/coderd/database/dbauthz/setup_test.go b/coderd/database/dbauthz/setup_test.go
@@ -171,7 +171,11 @@ func (s *MethodTestSuite) Subtest(testCaseF func(db database.Store, check *expec
 			fakeAuthorizer.AlwaysReturn = nil
 
 			outputs, err := callMethod(ctx)
-			s.NoError(err, "method %q returned an error", methodName)
+			if testCase.err == nil {
+				s.NoError(err, "method %q returned an error", methodName)
+			} else {
+				s.EqualError(err, testCase.err.Error(), "method %q returned an unexpected error", methodName)
+			}
 
 			// Some tests may not care about the outputs, so we only assert if
 			// they are provided.
@@ -292,6 +296,7 @@ type expects struct {
 	assertions []AssertRBAC
 	// outputs is optional. Can assert non-error return values.
 	outputs []reflect.Value
+	err     error
 }
 
 // Asserts is required. Asserts the RBAC authorize calls that should be made.
@@ -316,6 +321,12 @@ func (m *expects) Returns(rets ...any) *expects {
 	return m
 }
 
+// Errors is optional. If it is never called, it will not be asserted.
+func (m *expects) Errors(err error) *expects {
+	m.err = err
+	return m
+}
+
 // AssertRBAC contains the object and actions to be asserted.
 type AssertRBAC struct {
 	Object  rbac.Object
