Amend tests to use new deleted field

Author: Andrew Farries

components/gitpod-db/src/workspace-cluster-db.spec.db.ts

@@ -37,33 +37,33 @@ export class WorkspaceClusterDBSpec {
     }
 
     @test public async findByName() {
-        const wsc1: DBWorkspaceCluster = {
+        const wsc1: DBWorkspaceCluster = dbWorkspaceCluster({
             name: "eu71",
             applicationCluster: "eu02",
             url: "some-url",
             state: "available",
             score: 100,
             maxScore: 100,
             govern: true,
-        };
-        const wsc1a: DBWorkspaceCluster = {
+        });
+        const wsc1a: DBWorkspaceCluster = dbWorkspaceCluster({
             name: "eu71",
             applicationCluster: "us02",
             url: "some-url",
             state: "cordoned",
             score: 0,
             maxScore: 0,
             govern: false,
-        };
-        const wsc2: DBWorkspaceCluster = {
+        });
+        const wsc2: DBWorkspaceCluster = dbWorkspaceCluster({
             name: "us71",
             applicationCluster: "eu02",
             url: "some-url",
             state: "cordoned",
             score: 0,
             maxScore: 0,
             govern: false,
-        };
+        });
 
         await this.db.save(wsc1);
         await this.db.save(wsc1a);
@@ -89,33 +89,33 @@ export class WorkspaceClusterDBSpec {
     }
 
     @test public async deleteByName() {
-        const wsc1: DBWorkspaceCluster = {
+        const wsc1: DBWorkspaceCluster = dbWorkspaceCluster({
             name: "eu71",
             applicationCluster: "eu02",
             url: "some-url",
             state: "available",
             score: 100,
             maxScore: 100,
             govern: true,
-        };
-        const wsc1a: DBWorkspaceCluster = {
+        });
+        const wsc1a: DBWorkspaceCluster = dbWorkspaceCluster({
             name: "eu71",
             applicationCluster: "us02",
             url: "some-url",
             state: "cordoned",
             score: 0,
             maxScore: 0,
             govern: false,
-        };
-        const wsc2: DBWorkspaceCluster = {
+        });
+        const wsc2: DBWorkspaceCluster = dbWorkspaceCluster({
             name: "us71",
             applicationCluster: "eu02",
             url: "some-url",
             state: "cordoned",
             score: 0,
             maxScore: 0,
             govern: false,
-        };
+        });
 
         await this.db.save(wsc1);
         await this.db.save(wsc1a);
@@ -129,33 +129,33 @@ export class WorkspaceClusterDBSpec {
     }
 
     @test public async testFindFilteredByName() {
-        const wsc1: DBWorkspaceCluster = {
+        const wsc1: DBWorkspaceCluster = dbWorkspaceCluster({
             name: "eu71",
             applicationCluster: "eu02",
             url: "some-url",
             state: "available",
             score: 100,
             maxScore: 100,
             govern: true,
-        };
-        const wsc1a: DBWorkspaceCluster = {
+        });
+        const wsc1a: DBWorkspaceCluster = dbWorkspaceCluster({
             name: "eu71",
             applicationCluster: "us02",
             url: "some-url",
             state: "cordoned",
             score: 0,
             maxScore: 0,
             govern: false,
-        };
-        const wsc2: DBWorkspaceCluster = {
+        });
+        const wsc2: DBWorkspaceCluster = dbWorkspaceCluster({
             name: "us71",
             applicationCluster: "eu02",
             url: "some-url",
             state: "cordoned",
             score: 0,
             maxScore: 0,
             govern: false,
-        };
+        });
 
         await this.db.save(wsc1);
         await this.db.save(wsc1a);
@@ -168,33 +168,33 @@ export class WorkspaceClusterDBSpec {
     }
 
     @test public async testFindFilteredByApplicationCluster() {
-        const wsc1: DBWorkspaceCluster = {
+        const wsc1: DBWorkspaceCluster = dbWorkspaceCluster({
             name: "eu71",
             applicationCluster: "eu02",
             url: "some-url",
             state: "available",
             score: 100,
             maxScore: 100,
             govern: true,
-        };
-        const wsc1a: DBWorkspaceCluster = {
+        });
+        const wsc1a: DBWorkspaceCluster = dbWorkspaceCluster({
             name: "eu71",
             applicationCluster: "us02",
             url: "some-url",
             state: "cordoned",
             score: 0,
             maxScore: 0,
             govern: false,
-        };
-        const wsc2: DBWorkspaceCluster = {
+        });
+        const wsc2: DBWorkspaceCluster = dbWorkspaceCluster({
             name: "us71",
             applicationCluster: "us02",
             url: "some-url",
             state: "available",
             score: 100,
             maxScore: 100,
             govern: true,
-        };
+        });
 
         await this.db.save(wsc1);
         await this.db.save(wsc1a);
@@ -244,4 +244,8 @@ export class WorkspaceClusterDBSpec {
     }
 }
 
+function dbWorkspaceCluster(cluster: Omit<DBWorkspaceCluster, "deleted">): DBWorkspaceCluster {
+    return { ...cluster, deleted: false };
+}
+
 module.exports = WorkspaceClusterDBSpec;