fix: tests that broke because of new notification

DanielleMaywood · DanielleMaywood · commit 80d2145a3d1e · 2024-12-19T10:24:48.000Z
diff --git a/coderd/autobuild/lifecycle_executor_test.go b/coderd/autobuild/lifecycle_executor_test.go
@@ -274,7 +274,7 @@ func TestExecutorAutostartTemplateUpdated(t *testing.T) {
 			}
 
 			if tc.expectNotification {
-				sent := enqueuer.Sent()
+				sent := enqueuer.SentWithTemplateID(notifications.TemplateWorkspaceAutoUpdated)
 				require.Len(t, sent, 1)
 				require.Equal(t, sent[0].UserID, workspace.OwnerID)
 				require.Contains(t, sent[0].Targets, workspace.TemplateID)
@@ -285,7 +285,7 @@ func TestExecutorAutostartTemplateUpdated(t *testing.T) {
 				require.Equal(t, "autobuild", sent[0].Labels["initiator"])
 				require.Equal(t, "autostart", sent[0].Labels["reason"])
 			} else {
-				require.Empty(t, enqueuer.Sent())
+				require.Empty(t, enqueuer.SentWithTemplateID(notifications.TemplateWorkspaceAutoUpdated))
 			}
 		})
 	}
diff --git a/coderd/notifications/notificationstest/fake_enqueuer.go b/coderd/notifications/notificationstest/fake_enqueuer.go
@@ -97,3 +97,16 @@ func (f *FakeEnqueuer) Sent() []*FakeNotification {
 	defer f.mu.Unlock()
 	return append([]*FakeNotification{}, f.sent...)
 }
+
+func (f *FakeEnqueuer) SentWithTemplateID(id uuid.UUID) []*FakeNotification {
+	f.mu.Lock()
+	defer f.mu.Unlock()
+
+	sent := []*FakeNotification{}
+	for _, notif := range f.sent {
+		if notif.TemplateID == id {
+			sent = append(sent, notif)
+		}
+	}
+	return sent
+}
diff --git a/coderd/workspaces_test.go b/coderd/workspaces_test.go
@@ -585,17 +585,13 @@ func TestPostWorkspacesByOrganization(t *testing.T) {
 		workspace := coderdtest.CreateWorkspace(t, client, template.ID)
 		coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID)
 
-		var notif *notificationstest.FakeNotification
-		for _, n := range enqueuer.Sent() {
-			if n.TemplateID == notifications.TemplateWorkspaceCreated {
-				notif = n
-				break
-			}
-		}
-
-		assert.NotNil(t, notif)
-		assert.Equal(t, user.UserID, notif.UserID)
-		assert.Equal(t, notifications.TemplateWorkspaceCreated, notif.TemplateID)
+		sent := enqueuer.SentWithTemplateID(notifications.TemplateWorkspaceCreated)
+		require.Len(t, sent, 1)
+		require.Equal(t, user.UserID, sent[0].UserID)
+		require.Contains(t, sent[0].Targets, template.ID)
+		require.Contains(t, sent[0].Targets, workspace.ID)
+		require.Contains(t, sent[0].Targets, workspace.OrganizationID)
+		require.Contains(t, sent[0].Targets, workspace.OwnerID)
 	})
 
 	t.Run("CreateWithAuditLogs", func(t *testing.T) {
@@ -3623,15 +3619,14 @@ func TestWorkspaceNotifications(t *testing.T) {
 
 			// Then
 			require.NoError(t, err, "mark workspace as dormant")
-			sent := notifyEnq.Sent()
-			require.Len(t, sent, 2)
-			// notifyEnq.Sent[0] is an event for created user account
-			require.Equal(t, sent[1].TemplateID, notifications.TemplateWorkspaceDormant)
-			require.Equal(t, sent[1].UserID, workspace.OwnerID)
-			require.Contains(t, sent[1].Targets, template.ID)
-			require.Contains(t, sent[1].Targets, workspace.ID)
-			require.Contains(t, sent[1].Targets, workspace.OrganizationID)
-			require.Contains(t, sent[1].Targets, workspace.OwnerID)
+			sent := notifyEnq.SentWithTemplateID(notifications.TemplateWorkspaceDormant)
+			require.Len(t, sent, 1)
+			require.Equal(t, sent[0].TemplateID, notifications.TemplateWorkspaceDormant)
+			require.Equal(t, sent[0].UserID, workspace.OwnerID)
+			require.Contains(t, sent[0].Targets, template.ID)
+			require.Contains(t, sent[0].Targets, workspace.ID)
+			require.Contains(t, sent[0].Targets, workspace.OrganizationID)
+			require.Contains(t, sent[0].Targets, workspace.OwnerID)
 		})
 
 		t.Run("InitiatorIsOwner", func(t *testing.T) {
@@ -3662,7 +3657,7 @@ func TestWorkspaceNotifications(t *testing.T) {
 
 			// Then
 			require.NoError(t, err, "mark workspace as dormant")
-			require.Len(t, notifyEnq.Sent(), 0)
+			require.Len(t, notifyEnq.SentWithTemplateID(notifications.TemplateWorkspaceDormant), 0)
 		})
 
 		t.Run("ActivateDormantWorkspace", func(t *testing.T) {

Original file line number	Diff line number	Diff line change
`@@ -274,7 +274,7 @@ func TestExecutorAutostartTemplateUpdated(t *testing.T) {`
`274`	`274`	`}`
`275`	`275`
`276`	`276`	`if tc.expectNotification {`
`277`		`- sent := enqueuer.Sent()`
	`277`	`+ sent := enqueuer.SentWithTemplateID(notifications.TemplateWorkspaceAutoUpdated)`
`278`	`278`	`require.Len(t, sent, 1)`
`279`	`279`	`require.Equal(t, sent[0].UserID, workspace.OwnerID)`
`280`	`280`	`require.Contains(t, sent[0].Targets, workspace.TemplateID)`
`@@ -285,7 +285,7 @@ func TestExecutorAutostartTemplateUpdated(t *testing.T) {`
`285`	`285`	`require.Equal(t, "autobuild", sent[0].Labels["initiator"])`
`286`	`286`	`require.Equal(t, "autostart", sent[0].Labels["reason"])`
`287`	`287`	`} else {`
`288`		`- require.Empty(t, enqueuer.Sent())`
	`288`	`+ require.Empty(t, enqueuer.SentWithTemplateID(notifications.TemplateWorkspaceAutoUpdated))`
`289`	`289`	`}`
`290`	`290`	`})`
`291`	`291`	`}`