fix tests

mafredri · mafredri · commit 0263e1f789c3 · 2025-01-16T11:18:07.000Z
diff --git a/coderd/provisionerjobs_test.go b/coderd/provisionerjobs_test.go
@@ -13,6 +13,7 @@ import (
 	"github.com/coder/coder/v2/coderd/database"
 	"github.com/coder/coder/v2/coderd/database/dbgen"
 	"github.com/coder/coder/v2/coderd/database/dbtestutil"
+	"github.com/coder/coder/v2/coderd/rbac"
 	"github.com/coder/coder/v2/codersdk"
 	"github.com/coder/coder/v2/provisioner/echo"
 	"github.com/coder/coder/v2/provisionersdk/proto"
@@ -22,32 +23,14 @@ import (
 func TestProvisionerJobs(t *testing.T) {
 	t.Parallel()
 
-	// encode := func(v interface{}) []byte {
-	// 	b, err := json.Marshal(v)
-	// 	require.NoError(t, err)
-	// 	return b
-	// }
-
-	// db, ps := dbtestutil.NewDB(t,
-	// 	dbtestutil.WithDumpOnFailure(),
-	// 	//nolint:gocritic // Use UTC for consistent timestamp length in golden files.
-	// 	dbtestutil.WithTimezone("UTC"),
-	// )
-	// client, _, coderdAPI := coderdtest.NewWithAPI(t, &coderdtest.Options{
-	// 	IncludeProvisionerDaemon: true,
-	// 	Database:                 db,
-	// 	Pubsub:                   ps,
-	// })
-	// owner := coderdtest.CreateFirstUser(t, client)
-	// _, memberUser := coderdtest.CreateAnotherUser(t, client, owner.OrganizationID)
-
 	db, ps := dbtestutil.NewDB(t, dbtestutil.WithDumpOnFailure())
 	client := coderdtest.New(t, &coderdtest.Options{
 		IncludeProvisionerDaemon: true,
 		Database:                 db,
 		Pubsub:                   ps,
 	})
 	owner := coderdtest.CreateFirstUser(t, client)
+	templateAdminClient, _ := coderdtest.CreateAnotherUser(t, client, owner.OrganizationID, rbac.RoleTemplateAdmin())
 	memberClient, member := coderdtest.CreateAnotherUser(t, client, owner.OrganizationID)
 
 	// client, db := coderdtest.NewWithDatabase(t, &coderdtest.Options{IncludeProvisionerDaemon: true})
@@ -83,33 +66,41 @@ func TestProvisionerJobs(t *testing.T) {
 	t.Run("All", func(t *testing.T) {
 		t.Parallel()
 		ctx := testutil.Context(t, testutil.WaitMedium)
-		jobs, err := memberClient.OrganizationProvisionerJobs(ctx, owner.OrganizationID, nil)
+		jobs, err := templateAdminClient.OrganizationProvisionerJobs(ctx, owner.OrganizationID, nil)
 		require.NoError(t, err)
 		require.Len(t, jobs, 3)
 	})
 
 	t.Run("Pending", func(t *testing.T) {
 		t.Parallel()
 		ctx := testutil.Context(t, testutil.WaitMedium)
-		jobs, err := memberClient.OrganizationProvisionerJobs(ctx, owner.OrganizationID, &codersdk.OrganizationProvisionerJobsOptions{
+		jobs, err := templateAdminClient.OrganizationProvisionerJobs(ctx, owner.OrganizationID, &codersdk.OrganizationProvisionerJobsOptions{
 			Status: []codersdk.ProvisionerJobStatus{codersdk.ProvisionerJobPending},
 		})
-		for _, job := range jobs {
-			t.Logf("job: %#v", job)
-		}
 		require.NoError(t, err)
 		require.Len(t, jobs, 1)
 	})
 
 	t.Run("Limit", func(t *testing.T) {
 		t.Parallel()
 		ctx := testutil.Context(t, testutil.WaitMedium)
-		jobs, err := memberClient.OrganizationProvisionerJobs(ctx, owner.OrganizationID, &codersdk.OrganizationProvisionerJobsOptions{
+		jobs, err := templateAdminClient.OrganizationProvisionerJobs(ctx, owner.OrganizationID, &codersdk.OrganizationProvisionerJobsOptions{
 			Limit: 1,
 		})
 		require.NoError(t, err)
 		require.Len(t, jobs, 1)
 	})
+
+	// For now, this is not allowed even though the member has created a
+	// workspace. Once member-level permissions for jobs are supported
+	// by RBAC, this test should be updated.
+	t.Run("MemberDenied", func(t *testing.T) {
+		t.Parallel()
+		ctx := testutil.Context(t, testutil.WaitMedium)
+		jobs, err := memberClient.OrganizationProvisionerJobs(ctx, owner.OrganizationID, nil)
+		require.Error(t, err)
+		require.Len(t, jobs, 0)
+	})
 }
 
 func TestProvisionerJobLogs(t *testing.T) {
