projects
/
arvados-workbench2.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 76da3d860a2cf730b0cb780fa7c150f9be410149..9052360627c6f68ff0d95253efa6b0f4ae88bc55 100644
(file)
--- a/
src/services/project-service/project-service.test.ts
+++ b/
src/services/project-service/project-service.test.ts
@@
-3,17
+3,20
@@
// SPDX-License-Identifier: AGPL-3.0
import axios from "axios";
// SPDX-License-Identifier: AGPL-3.0
import axios from "axios";
-import MockAdapter from "axios-mock-adapter/types";
-import ProjectService from "./project-service";
-import FilterBuilder from "../../common/api/filter-builder";
-import { ProjectResource } from "../../models/project";
+import { ProjectService } from "./project-service";
+import { FilterBuilder } from "~/services/api/filter-builder";
+import { ApiActions } from "~/services/api/api-actions";
describe("CommonResourceService", () => {
const axiosInstance = axios.create();
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: {} }));
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",
const resource = await projectService.create({ name: "nameValue" });
expect(axiosInstance.post).toHaveBeenCalledWith("/groups/", {
name: "nameValue",
@@
-21,19
+24,17
@@
describe("CommonResourceService", () => {
});
});
});
});
-
it("#list has groupClass filter set by default", async () => {
axiosInstance.get = jest.fn(() => Promise.resolve({ data: {} }));
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: {
const resource = await projectService.list();
expect(axiosInstance.get).toHaveBeenCalledWith("/groups/", {
params: {
- filters: FilterBuilder
- .create<ProjectResource>()
+ filters: "[" + new FilterBuilder()
.addEqual("groupClass", "project")
.addEqual("groupClass", "project")
- .serialize()
+ .getFilters() + "]",
+ order: undefined
}
});
});
}
});
});
-
});
});