Merge branch '17426-plug-ins' refs #17426

[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 688a476b47c620ca4e04a75414b6d3221bbf7ab7..3634b8cba60a3fc84621b4f12ef87c56ad9b53b6 100644 (file)
--- a/src/services/project-service/project-service.test.ts
+++ b/src/services/project-service/project-service.test.ts
@@ -4,16 +4,21 @@
 
 import axios from "axios";
 import { ProjectService } from "./project-service";
-import { FilterBuilder } from "~/common/api/filter-builder";
+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/", {
+        expect(axiosInstance.post).toHaveBeenCalledWith("/groups", {
             name: "nameValue",
             group_class: "project"
         });
@@ -21,14 +26,14 @@ 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/", {
+        expect(axiosInstance.get).toHaveBeenCalledWith("/groups", {
             params: {
-                filters: FilterBuilder
-                    .create()
-                    .addEqual("groupClass", "project")
-                    .serialize()
+                filters: "[" + new FilterBuilder()
+                    .addIn("group_class", ["project", "filter"])
+                    .getFilters() + "]",
+                order: undefined
             }
         });
     });