tests

Author: JF

package.json

@@ -29,7 +29,7 @@
     "eslint-plugin-import": "^2.2.0",
     "eslint-plugin-prettier": "^2.6.0",
     "flow-bin": "^0.42.0",
-    "jest": "^20.0.0",
+    "jest": "^23.0.0",
     "jest-fetch-mock": "^1.0.8",
     "prettier": "^1.12.1"
   },

src/hydra/addFilters.js

@@ -0,0 +1,39 @@
+import Filter from "../Filter";
+import fetchResource from "./fetchResource";
+
+export default api => {
+  const promises = [];
+
+  for (const resource of api.resources) {
+    let promise = fetchResource(resource.url).then(response => {
+      const resourceFilters = [];
+
+      if (response.filters) {
+        for (const filter of response.filters) {
+          let property = filter.property;
+
+          // TODO : To prevent PropertyFilter, maybe should be handle specifically ?
+          if (property === null) {
+            continue;
+          }
+
+          const resourceFilter = new Filter(property, filter.variable);
+
+          resourceFilters.push(resourceFilter);
+        }
+      }
+
+      return resourceFilters;
+    });
+
+    promises.push(promise);
+  }
+
+  return Promise.all(promises).then(values => {
+    api.resources.map((resource, index) => {
+      resource.filters = values[index];
+    });
+
+    return api;
+  });
+};

src/hydra/fetchResource.js

@@ -0,0 +1,13 @@
+import fetchJsonLd from "./fetchJsonLd";
+import get from "lodash.get";
+
+export default async entrypointUrl => {
+  return await fetchJsonLd(entrypointUrl, { items_per_page: 0 }).then(
+    d => ({
+      filters: get(d, "body.hydra:search.hydra:mapping")
+    }),
+    () => {
+      throw new Error("Unreachable resource");
+    }
+  );
+};

src/hydra/parseHydraDocumentation.js

@@ -2,10 +2,10 @@ import { promises } from "jsonld";
 import get from "lodash.get";
 import Api from "../Api";
 import Field from "../Field";
-import Filter from "../Filter";
 import Resource from "../Resource";
 import Operation from "../Operation";
 import fetchJsonLd from "./fetchJsonLd";
+import addFilters from "./addFilters";
 
 /**
  * Extracts the short name of a resource.
@@ -118,14 +118,6 @@ function fetchEntrypointAndDocs(entrypointUrl, options = {}) {
     );
 }
 
-function fetchResource(entrypointUrl) {
-  return fetchJsonLd(entrypointUrl, { items_per_page: 0 }).then(d => {
-    return {
-      filters: get(d, "body.hydra:search.hydra:mapping")
-    };
-  });
-}
-
 function removeTrailingSlash(url) {
   if (/\/$/.test(url)) {
     url = url.slice(0, -1);
@@ -189,43 +181,6 @@ function findRelatedClass(docs, property) {
   throw new Error(`Cannot find the class related to ${property["@id"]}.`);
 }
 
-function addFilters(api) {
-  const promises = [];
-
-  for (const resource of api.resources) {
-    let promise = fetchResource(resource.url).then(response => {
-      const resourceFilters = [];
-
-      if (response.filters) {
-        for (const filter of response.filters) {
-          let property = filter.property;
-
-          // TODO : To prevent PropertyFilter, maybe should be handle specifically ?
-          if (property === null) {
-            continue;
-          }
-
-          const resourceFilter = new Filter(property, filter.variable);
-
-          resourceFilters.push(resourceFilter);
-        }
-      }
-
-      return resourceFilters;
-    });
-
-    promises.push(promise);
-  }
-
-  return Promise.all(promises).then(values => {
-    api.resources.map((resource, index) => {
-      resource.filters = values[index];
-    });
-
-    return api;
-  });
-}
-
 /**
  * Parses a Hydra documentation and converts it to an intermediate representation.
  *
@@ -464,7 +419,8 @@ export default function parseHydraDocumentation(entrypointUrl, options = {}) {
                 relatedClass,
                 '["http://www.w3.org/2002/07/owl#deprecated"][0]["@value"]',
                 false
-              )
+              ),
+              filters: []
             })
           );
         }

src/hydra/parseHydraDocumentation.test.js

@@ -552,6 +552,24 @@ const docs = `{
 ]
 }`;
 
+const resourceCollection = `{
+  "hydra:search": {
+    "hydra:mapping": [
+      {
+        "property": "id",
+        "variable": "id"
+      }
+    ]
+  }
+}`;
+
+const filters = [
+  {
+    property: "id",
+    variable: "id"
+  }
+];
+
 const book = {
   name: "books",
   url: "http://localhost/books",
@@ -743,7 +761,8 @@ const book = {
       deprecated: false
     }
   ],
-  deprecated: false
+  deprecated: false,
+  filters: filters
 };
 
 const review = {
@@ -886,7 +905,8 @@ const review = {
       deprecated: false
     }
   ],
-  deprecated: false
+  deprecated: false,
+  filters: filters
 };
 
 const customResource = {
@@ -1012,7 +1032,8 @@ const customResource = {
       deprecated: false
     }
   ],
-  deprecated: false
+  deprecated: false,
+  filters: filters
 };
 
 const deprecatedResource = {
@@ -1072,13 +1093,16 @@ const deprecatedResource = {
       deprecated: true
     }
   ],
-  deprecated: true
+  deprecated: true,
+  filters: filters
 };
 
+const resources = [book, review, customResource, deprecatedResource];
+
 const expectedApi = {
   entrypoint: "http://localhost",
   title: "API Platform's demo",
-  resources: [book, review, customResource, deprecatedResource]
+  resources: resources
 };
 
 const init = {
@@ -1091,30 +1115,45 @@ const init = {
   })
 };
 
-test("parse a Hydra documentation", () => {
-  fetch.mockResponses([entrypoint, init], [docs, init]);
+test("parse a Hydra documentation", async () => {
+  fetch.mockResponses(
+    [entrypoint, init],
+    [docs, init],
+    [resourceCollection, init],
+    [resourceCollection, init],
+    [resourceCollection, init],
+    [resourceCollection, init]
+  );
 
   const options = { headers: new Headers({ CustomHeader: "customValue" }) };
 
-  return parseHydraDocumentation("http://localhost", options).then(data => {
+  await parseHydraDocumentation("http://localhost", options).then(data => {
     expect(JSON.stringify(data.api, null, 2)).toBe(
       JSON.stringify(expectedApi, null, 2)
     );
     expect(data.response).toBeDefined();
     expect(data.status).toBe(200);
 
-    expect(fetch).toHaveBeenCalledTimes(2);
-    expect(fetch).toHaveBeenLastCalledWith(
+    expect(fetch).toHaveBeenCalledTimes(2 + resources.length);
+    expect(fetch).toHaveBeenNthCalledWith(
+      2,
       "http://localhost/docs.jsonld",
       options
     );
   });
 });
 
-test("parse a Hydra documentation (http://localhost/)", () => {
-  fetch.mockResponses([entrypoint, init], [docs, init]);
+test("parse a Hydra documentation (http://localhost/)", async () => {
+  fetch.mockResponses(
+    [entrypoint, init],
+    [docs, init],
+    [resourceCollection, init],
+    [resourceCollection, init],
+    [resourceCollection, init],
+    [resourceCollection, init]
+  );
 
-  return parseHydraDocumentation("http://localhost/").then(data => {
+  await parseHydraDocumentation("http://localhost/").then(data => {
     expect(JSON.stringify(data.api, null, 2)).toBe(
       JSON.stringify(expectedApi, null, 2)
     );