X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/0ce21e3487078a53f1b653446b5e615cd6dda709..4b961d16b8f8ef8afbd13697a79fe4684acd0416:/src/models/test-utils.ts

diff --git a/src/models/test-utils.ts b/src/models/test-utils.ts
index aa8d96b3..b08ce5a0 100644
--- a/src/models/test-utils.ts
+++ b/src/models/test-utils.ts
@@ -3,21 +3,10 @@
 // SPDX-License-Identifier: AGPL-3.0
 
 import { GroupClass, GroupResource } from "./group";
-import { ResourceKind } from "./kinds";
-import { Resource } from "../common/api/common-resource-service";
+import { Resource, ResourceKind } from "./resource";
+import { ProjectResource } from "./project";
 
-type ResourceUnion = GroupResource;
-
-export const mockResource = (kind: ResourceKind, data: Partial<Exclude<ResourceUnion, "kind">>) => {
-    switch (kind) {
-        case ResourceKind.Group:
-            return mockGroupResource({ ...data, kind });
-        default:
-            return mockCommonResource({ ...data, kind });
-    }
-};
-
-export const mockGroupResource = (data: Partial<Exclude<GroupResource, "kind">>): GroupResource => ({
+export const mockGroupResource = (data: Partial<GroupResource> = {}): GroupResource => ({
     createdAt: "",
     deleteAt: "",
     description: "",
@@ -25,7 +14,7 @@ export const mockGroupResource = (data: Partial<Exclude<GroupResource, "kind">>)
     groupClass: null,
     href: "",
     isTrashed: false,
-    kind: ResourceKind.Group,
+    kind: ResourceKind.GROUP,
     modifiedAt: "",
     modifiedByClientUuid: "",
     modifiedByUserUuid: "",
@@ -34,17 +23,22 @@ export const mockGroupResource = (data: Partial<Exclude<GroupResource, "kind">>)
     properties: "",
     trashAt: "",
     uuid: "",
-    writeableBy: []
+    writeableBy: [],
+    ...data
 });
 
-const mockCommonResource = <T extends Resource>(data: Partial<T> & { kind: ResourceKind }): Resource => ({
+export const mockProjectResource = (data: Partial<ProjectResource> = {}): ProjectResource =>
+    mockGroupResource({ ...data, groupClass: GroupClass.PROJECT }) as ProjectResource;
+
+export const mockCommonResource = (data: Partial<Resource>): Resource => ({
     createdAt: "",
     etag: "",
     href: "",
-    kind: data.kind,
+    kind: ResourceKind.NONE,
     modifiedAt: "",
     modifiedByClientUuid: "",
     modifiedByUserUuid: "",
     ownerUuid: "",
-    uuid: ""
+    uuid: "",
+    ...data
 });