Merge branch 'master' of git.curoverse.com:arvados-workbench2 into 14433_properties_i...

[arvados-workbench2.git] / src / services / project-service / project-service.test.ts

diff --git a/src/services/project-service/project-service.test.ts b/src/services/project-service/project-service.test.ts
index f915c2dfb7939653fba3ac54a3533fd340d4bb4f..9052360627c6f68ff0d95253efa6b0f4ae88bc55 100644 (file)
--- a/src/services/project-service/project-service.test.ts
+++ b/src/services/project-service/project-service.test.ts
@@ -4,15 +4,19 @@
 
 import axios from "axios";
 import { ProjectService } from "./project-service";
-import { FilterBuilder } from "../../common/api/filter-builder";
-import { ProjectResource } from "../../models/project";
+import { FilterBuilder } from "~/services/api/filter-builder";
+import { ApiActions } from "~/services/api/api-actions";
 
 describe("CommonResourceService", () => {
     const axiosInstance = axios.create();
+    const actions: ApiActions = {
+        progressFn: (id: string, working: boolean) => {},
+        errorFn: (id: string, message: string) => {}
+    };
 
     it(`#create has groupClass set to "project"`, async () => {
         axiosInstance.post = jest.fn(() => Promise.resolve({ data: {} }));
-        const projectService = new ProjectService(axiosInstance);
+        const projectService = new ProjectService(axiosInstance, actions);
         const resource = await projectService.create({ name: "nameValue" });
         expect(axiosInstance.post).toHaveBeenCalledWith("/groups/", {
             name: "nameValue",
@@ -20,19 +24,17 @@ describe("CommonResourceService", () => {
         });
     });
 
-
     it("#list has groupClass filter set by default", async () => {
         axiosInstance.get = jest.fn(() => Promise.resolve({ data: {} }));
-        const projectService = new ProjectService(axiosInstance);
+        const projectService = new ProjectService(axiosInstance, actions);
         const resource = await projectService.list();
         expect(axiosInstance.get).toHaveBeenCalledWith("/groups/", {
             params: {
-                filters: FilterBuilder
-                    .create<ProjectResource>()
+                filters: "[" + new FilterBuilder()
                     .addEqual("groupClass", "project")
-                    .serialize()
+                    .getFilters() + "]",
+                order: undefined
             }
         });
     });
-
 });