Merge branch 'main' into 16-manual-build-failed

coder · mtojek · Aug 27, 2024 · Aug 23, 2024 · Aug 23, 2024 · Aug 26, 2024
commit a13eb9e9632566ea80c0aef35d26323e42654dce
diff --git a/coderd/notifications/notifications_test.go b/coderd/notifications/notifications_test.go
@@ -743,32 +743,6 @@ func TestNotificationTemplatesCanRender(t *testing.T) {
 				},
 			},
 		},
-		{
-			name: "TemplateWorkspaceMarkedForDeletionInOneWeek",
-			id:   notifications.TemplateWorkspaceMarkedForDeletion,
-			payload: types.MessagePayload{
-				UserName: "bobby",
-				Labels: map[string]string{
-					"name":           "bobby-workspace",
-					"reason":         "template updated to new dormancy policy",
-					"dormancyHours":  "168", // 168 hours = 7 days = 1 week
-					"timeTilDormant": "1 week",
-				},
-			},
-		},
-		{
-			name: "TemplateWorkspaceManualBuildFailed",
-			id:   notifications.TemplateWorkspaceManualBuildFailed,
-			payload: types.MessagePayload{
-				UserName: "bobby",
-				Labels: map[string]string{
-					"name":                     "bobby-workspace",
-					"template_name":            "bobby-template",
-					"initiator":                "joe",
-					"workspace_owner_username": "mrbobby",
-				},
-			},
-		},
 		{
 			name: "TemplateUserAccountCreated",
 			id:   notifications.TemplateUserAccountCreated,