Skip to content

Commit a92d059

Browse files
mtojekmtojek
committed
Fix tests
1 parent 8696b70 commit a92d059

File tree

2 files changed

+16
-14
lines changed

2 files changed

+16
-14
lines changed

‎coderd/autobuild/lifecycle_executor_test.go

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1115,13 +1115,14 @@ func TestNotifications(t *testing.T) {
11151115
require.NotNil(t, workspace.DormantAt)
11161116

11171117
// Check that a notification was enqueued
1118-
require.Len(t, notifyEnq.Sent, 1)
1119-
require.Equal(t, notifyEnq.Sent[0].UserID, workspace.OwnerID)
1120-
require.Equal(t, notifyEnq.Sent[0].TemplateID, notifications.TemplateWorkspaceDormant)
1121-
require.Contains(t, notifyEnq.Sent[0].Targets, template.ID)
1122-
require.Contains(t, notifyEnq.Sent[0].Targets, workspace.ID)
1123-
require.Contains(t, notifyEnq.Sent[0].Targets, workspace.OrganizationID)
1124-
require.Contains(t, notifyEnq.Sent[0].Targets, workspace.OwnerID)
1118+
require.Len(t, notifyEnq.Sent, 2)
1119+
// notifyEnq.Sent[0] is an event for created user account
1120+
require.Equal(t, notifyEnq.Sent[1].UserID, workspace.OwnerID)
1121+
require.Equal(t, notifyEnq.Sent[1].TemplateID, notifications.TemplateWorkspaceDormant)
1122+
require.Contains(t, notifyEnq.Sent[1].Targets, template.ID)
1123+
require.Contains(t, notifyEnq.Sent[1].Targets, workspace.ID)
1124+
require.Contains(t, notifyEnq.Sent[1].Targets, workspace.OrganizationID)
1125+
require.Contains(t, notifyEnq.Sent[1].Targets, workspace.OwnerID)
11251126
})
11261127
}
11271128

‎coderd/workspaces_test.go

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3476,13 +3476,14 @@ func TestNotifications(t *testing.T) {
34763476

34773477
// Then
34783478
require.NoError(t, err, "mark workspace as dormant")
3479-
require.Len(t, notifyEnq.Sent, 1)
3480-
require.Equal(t, notifyEnq.Sent[0].TemplateID, notifications.TemplateWorkspaceDormant)
3481-
require.Equal(t, notifyEnq.Sent[0].UserID, workspace.OwnerID)
3482-
require.Contains(t, notifyEnq.Sent[0].Targets, template.ID)
3483-
require.Contains(t, notifyEnq.Sent[0].Targets, workspace.ID)
3484-
require.Contains(t, notifyEnq.Sent[0].Targets, workspace.OrganizationID)
3485-
require.Contains(t, notifyEnq.Sent[0].Targets, workspace.OwnerID)
3479+
require.Len(t, notifyEnq.Sent, 2)
3480+
// notifyEnq.Sent[0] is an event for created user account
3481+
require.Equal(t, notifyEnq.Sent[1].TemplateID, notifications.TemplateWorkspaceDormant)
3482+
require.Equal(t, notifyEnq.Sent[1].UserID, workspace.OwnerID)
3483+
require.Contains(t, notifyEnq.Sent[1].Targets, template.ID)
3484+
require.Contains(t, notifyEnq.Sent[1].Targets, workspace.ID)
3485+
require.Contains(t, notifyEnq.Sent[1].Targets, workspace.OrganizationID)
3486+
require.Contains(t, notifyEnq.Sent[1].Targets, workspace.OwnerID)
34863487
})
34873488

34883489
t.Run("InitiatorIsOwner", func(t *testing.T) {

0 commit comments

Comments
 (0)