X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/0aea0fe49faebf703226d662012aae71904a5a30..6e4b23e9a99ab64e25c60a128e6beb4fa8636374:/src/services/common-service/common-resource-service.test.ts diff --git a/src/services/common-service/common-resource-service.test.ts b/src/services/common-service/common-resource-service.test.ts index a6a8b9d0..b94756ae 100644 --- a/src/services/common-service/common-resource-service.test.ts +++ b/src/services/common-service/common-resource-service.test.ts @@ -5,8 +5,8 @@ import { CommonResourceService } from "./common-resource-service"; import axios, { AxiosInstance } from "axios"; import MockAdapter from "axios-mock-adapter"; -import { Resource } from "src/models/resource"; -import { ApiActions } from "~/services/api/api-actions"; +import { Resource } from "models/resource"; +import { ApiActions } from "services/api/api-actions"; const actions: ApiActions = { progressFn: (id: string, working: boolean) => {}, @@ -15,51 +15,67 @@ const actions: ApiActions = { export const mockResourceService = >( Service: new (client: AxiosInstance, actions: ApiActions) => C) => { - const axiosInstance = axios.create(); - const axiosMock = new MockAdapter(axiosInstance); - const service = new Service(axiosInstance, actions); - Object.keys(service).map(key => service[key] = jest.fn()); - return service; -}; + const axiosInstance = axios.create(); + const service = new Service(axiosInstance, actions); + Object.keys(service).map(key => service[key] = jest.fn()); + return service; + }; describe("CommonResourceService", () => { - const axiosInstance = axios.create(); - const axiosMock = new MockAdapter(axiosInstance); + let axiosInstance: AxiosInstance; + let axiosMock: MockAdapter; beforeEach(() => { - axiosMock.reset(); + axiosInstance = axios.create(); + axiosMock = new MockAdapter(axiosInstance); }); it("#create", async () => { axiosMock - .onPost("/resource/") + .onPost("/resources") .reply(200, { owner_uuid: "ownerUuidValue" }); - const commonResourceService = new CommonResourceService(axiosInstance, "resource", actions); + const commonResourceService = new CommonResourceService(axiosInstance, "resources", actions); const resource = await commonResourceService.create({ ownerUuid: "ownerUuidValue" }); expect(resource).toEqual({ ownerUuid: "ownerUuidValue" }); }); it("#create maps request params to snake case", async () => { axiosInstance.post = jest.fn(() => Promise.resolve({data: {}})); - const commonResourceService = new CommonResourceService(axiosInstance, "resource", actions); + const commonResourceService = new CommonResourceService(axiosInstance, "resources", actions); await commonResourceService.create({ ownerUuid: "ownerUuidValue" }); - expect(axiosInstance.post).toHaveBeenCalledWith("/resource/", {owner_uuid: "ownerUuidValue"}); + expect(axiosInstance.post).toHaveBeenCalledWith("/resources", {resource: {owner_uuid: "ownerUuidValue"}}); + }); + + it("#create ignores fields listed as readonly", async () => { + axiosInstance.post = jest.fn(() => Promise.resolve({data: {}})); + const commonResourceService = new CommonResourceService(axiosInstance, "resources", actions); + // UUID fields are read-only on all resources. + await commonResourceService.create({ uuid: "this should be ignored", ownerUuid: "ownerUuidValue" }); + expect(axiosInstance.post).toHaveBeenCalledWith("/resources", {resource: {owner_uuid: "ownerUuidValue"}}); + }); + + it("#update ignores fields listed as readonly", async () => { + axiosInstance.put = jest.fn(() => Promise.resolve({data: {}})); + const commonResourceService = new CommonResourceService(axiosInstance, "resources", actions); + // UUID fields are read-only on all resources. + await commonResourceService.update('resource-uuid', { uuid: "this should be ignored", ownerUuid: "ownerUuidValue" }); + expect(axiosInstance.put).toHaveBeenCalledWith("/resources/resource-uuid", {resource: {owner_uuid: "ownerUuidValue"}}); }); it("#delete", async () => { axiosMock - .onDelete("/resource/uuid") + .onDelete("/resources/uuid") .reply(200, { deleted_at: "now" }); - const commonResourceService = new CommonResourceService(axiosInstance, "resource", actions); + const commonResourceService = new CommonResourceService(axiosInstance, "resources", actions); const resource = await commonResourceService.delete("uuid"); expect(resource).toEqual({ deletedAt: "now" }); }); it("#get", async () => { axiosMock - .onGet("/resource/uuid") + .onGet("/resources/uuid") .reply(200, { modified_at: "now", properties: { @@ -67,7 +83,7 @@ describe("CommonResourceService", () => { } }); - const commonResourceService = new CommonResourceService(axiosInstance, "resource", actions); + const commonResourceService = new CommonResourceService(axiosInstance, "resources", actions); const resource = await commonResourceService.get("uuid"); // Only first level keys are mapped to camel case expect(resource).toEqual({ @@ -80,7 +96,7 @@ describe("CommonResourceService", () => { it("#list", async () => { axiosMock - .onGet("/resource/") + .onGet("/resources") .reply(200, { kind: "kind", offset: 2, @@ -94,7 +110,7 @@ describe("CommonResourceService", () => { items_available: 20 }); - const commonResourceService = new CommonResourceService(axiosInstance, "resource", actions); + const commonResourceService = new CommonResourceService(axiosInstance, "resources", actions); const resource = await commonResourceService.list({ limit: 10, offset: 1 }); // First level keys are mapped to camel case inside "items" arrays expect(resource).toEqual({ @@ -110,4 +126,29 @@ describe("CommonResourceService", () => { itemsAvailable: 20 }); }); + + it("#list using POST when query string is too big", async () => { + axiosMock + .onAny("/resources") + .reply(200); + const tooBig = 'x'.repeat(1500); + const commonResourceService = new CommonResourceService(axiosInstance, "resources", actions); + await commonResourceService.list({ filters: tooBig }); + expect(axiosMock.history.get.length).toBe(0); + expect(axiosMock.history.post.length).toBe(1); + expect(axiosMock.history.post[0].data.get('filters')).toBe(`[${tooBig}]`); + expect(axiosMock.history.post[0].params._method).toBe('GET'); + }); + + it("#list using GET when query string is not too big", async () => { + axiosMock + .onAny("/resources") + .reply(200); + const notTooBig = 'x'.repeat(1480); + const commonResourceService = new CommonResourceService(axiosInstance, "resources", actions); + await commonResourceService.list({ filters: notTooBig }); + expect(axiosMock.history.post.length).toBe(0); + expect(axiosMock.history.get.length).toBe(1); + expect(axiosMock.history.get[0].params.filters).toBe(`[${notTooBig}]`); + }); });