Fix tests passing

No issue #

Arvados-DCO-1.1-Signed-off-by: Daniel Kos <daniel.kos@contractors.roche.com>

diff --git a/src/common/api/order-builder.test.ts b/src/common/api/order-builder.test.ts
index 56b66f3bdd461459bf0b3d61ae4b87b45ef71ea8..f56e0634357e2ad4ff3a8b27eba6fedec8ee493c 100644 (file)
--- a/src/common/api/order-builder.test.ts
+++ b/src/common/api/order-builder.test.ts
@@ -10,6 +10,6 @@ describe("OrderBuilder", () => {
             .addAsc("kind")
             .addDesc("modifiedAt")
             .getOrder();
-        expect(order).toEqual(["kind asc", "modified_at desc"]);
+        expect(order).toEqual("kind asc,modified_at desc");
     });
 });

diff --git a/src/services/favorite-service/favorite-service.test.ts b/src/services/favorite-service/favorite-service.test.ts
index 47211fed1ff78b30c5c00c37208c8a410d4fc21a..d4bf9ac7f68c2bf14bccd1dd685e8db29d13cab3 100644 (file)
--- a/src/services/favorite-service/favorite-service.test.ts
+++ b/src/services/favorite-service/favorite-service.test.ts
@@ -48,7 +48,7 @@ describe("FavoriteService", () => {
 
         const newFavorite = await favoriteService.delete({ userUuid: "userUuid", resourceUuid: "resourceUuid" });
 
-        expect(list.mock.calls[0][0].filters.getFilters()).toEqual(filters.getFilters());
+        expect(list.mock.calls[0][0].filters).toEqual(filters.getFilters());
         expect(linkService.delete).toHaveBeenCalledWith("linkUuid");
         expect(newFavorite[0].uuid).toEqual("linkUuid");
     });
@@ -66,9 +66,9 @@ describe("FavoriteService", () => {
 
         const favorites = await favoriteService.list("userUuid");
 
-        expect(list.mock.calls[0][0].filters.getFilters()).toEqual(listFilters.getFilters());
+        expect(list.mock.calls[0][0].filters).toEqual(listFilters.getFilters());
         expect(contents.mock.calls[0][0]).toEqual("userUuid");
-        expect(contents.mock.calls[0][1].filters.getFilters()).toEqual(contentFilters.getFilters());
+        expect(contents.mock.calls[0][1].filters).toEqual(contentFilters.getFilters());
         expect(favorites).toEqual({ items: [{ uuid: "resourceUuid" }] });
     });
 
@@ -83,7 +83,7 @@ describe("FavoriteService", () => {
 
         const favorites = await favoriteService.checkPresenceInFavorites("userUuid", ["foo", "oof"]);
 
-        expect(list.mock.calls[0][0].filters.getFilters()).toEqual(listFilters.getFilters());
+        expect(list.mock.calls[0][0].filters).toEqual(listFilters.getFilters());
         expect(favorites).toEqual({ foo: true, oof: false });
     });
 

diff --git a/src/services/project-service/project-service.test.ts b/src/services/project-service/project-service.test.ts
index 93063462dcf33b62d0664c0dbd1f8fcf4e4881b6..a717736c3a68f3fb3e5ca9692696fcad5d72d095 100644 (file)
--- a/src/services/project-service/project-service.test.ts
+++ b/src/services/project-service/project-service.test.ts
@@ -25,9 +25,10 @@ describe("CommonResourceService", () => {
         const resource = await projectService.list();
         expect(axiosInstance.get).toHaveBeenCalledWith("/groups/", {
             params: {
-                filters: new FilterBuilder()
+                filters: "[" + new FilterBuilder()
                     .addEqual("groupClass", "project")
-                    .getFilters()
+                    .getFilters() + "]",
+                order: undefined
             }
         });
     });