bookmarks-rdflib: use test-support from rdflib-utils

solid-contrib · Jul 10, 2024 · 6ba0339 · 6ba0339
1 parent b21376b
commit 6ba0339
Show file tree

Hide file tree

Showing 7 changed files with 46 additions and 125 deletions.
diff --git a/bookmarks/rdflib/jest.config.ts b/bookmarks/rdflib/jest.config.ts
@@ -14,13 +14,14 @@ const config: Config = {
   transform: {
     // '^.+\\.[tj]sx?$' to process js/ts with `ts-jest`
     // '^.+\\.m?[tj]sx?$' to process js/ts/mjs/mts with `ts-jest`
-    "^.+\\.ts$": [
+    "^.+\\.[tj]s$": [
       "ts-jest",
       {
         useESM: true,
       },
     ],
   },
+  transformIgnorePatterns: ["node_modules/(?!(@solid-data-modules)/)"],
 };
 
 export default config;
diff --git a/bookmarks/rdflib/package-lock.json b/bookmarks/rdflib/package-lock.json
diff --git a/bookmarks/rdflib/package.json b/bookmarks/rdflib/package.json
@@ -60,6 +60,6 @@
     "typescript": "^5.4.5"
   },
   "dependencies": {
-    "short-unique-id": "^5.2.0"
+    "@solid-data-modules/rdflib-utils": "^0.2.0"
   }
 }
diff --git a/bookmarks/rdflib/src/module/_integration-tests/create-bookmark.integration.spec.ts b/bookmarks/rdflib/src/module/_integration-tests/create-bookmark.integration.spec.ts
@@ -1,13 +1,14 @@
 import { BookmarksModuleRdfLib } from "../BookmarksModuleRdfLib";
 
 import { generateId } from "../../generate-id";
-import { expectPatchRequest } from "../../test-support/expectRequests";
-import { Fetcher, graph, UpdateManager } from "rdflib";
 import {
+  expectPatchRequest,
   mockLdpContainer,
   mockNotFound,
   mockTurtleDocument,
-} from "../../test-support/mockResponses";
+} from "@solid-data-modules/rdflib-utils/test-support";
+import { Fetcher, graph, UpdateManager } from "rdflib";
+
 import { when } from "jest-when";
 
 jest.mock("../../generate-id");
@@ -48,11 +49,17 @@ describe("create bookmark", () => {
     expectPatchRequest(
       authenticatedFetch,
       "https://pod.test/alice/bookmarks/70501305",
-      `INSERT DATA { <https://pod.test/alice/bookmarks/70501305#it> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/01/bookmark#Bookmark> .
-<https://pod.test/alice/bookmarks/70501305#it> <http://purl.org/dc/terms/title> "My favorite website" .
-<https://pod.test/alice/bookmarks/70501305#it> <http://www.w3.org/2002/01/bookmark#recalls> <https://favorite.example> .
-<https://pod.test/alice/bookmarks/70501305#it> <http://purl.org/dc/terms/created> "2024-01-02T03:04:05.678Z"^^<http://www.w3.org/2001/XMLSchema#dateTime> .
- }`,
+      `@prefix solid: <http://www.w3.org/ns/solid/terms#>.
+@prefix ex: <http://www.example.org/terms#>.
+
+_:patch
+
+      solid:inserts {
+        <https://pod.test/alice/bookmarks/70501305#it> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/01/bookmark#Bookmark> .
+        <https://pod.test/alice/bookmarks/70501305#it> <http://purl.org/dc/terms/title> "My favorite website" .
+        <https://pod.test/alice/bookmarks/70501305#it> <http://www.w3.org/2002/01/bookmark#recalls> <https://favorite.example> .
+        <https://pod.test/alice/bookmarks/70501305#it> <http://purl.org/dc/terms/created> "2024-01-02T03:04:05.678Z"^^<http://www.w3.org/2001/XMLSchema#dateTime> .
+      };   a solid:InsertDeletePatch .`,
     );
   });
 
@@ -90,11 +97,17 @@ describe("create bookmark", () => {
     expectPatchRequest(
       authenticatedFetch,
       "https://pod.test/alice/bookmarks",
-      `INSERT DATA { <https://pod.test/alice/bookmarks#f7a4eeb7> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/01/bookmark#Bookmark> .
-<https://pod.test/alice/bookmarks#f7a4eeb7> <http://purl.org/dc/terms/title> "My favorite website" .
-<https://pod.test/alice/bookmarks#f7a4eeb7> <http://www.w3.org/2002/01/bookmark#recalls> <https://favorite.example> .
-<https://pod.test/alice/bookmarks#f7a4eeb7> <http://purl.org/dc/terms/created> "2024-01-02T03:04:05.678Z"^^<http://www.w3.org/2001/XMLSchema#dateTime> .
- }`,
+      `@prefix solid: <http://www.w3.org/ns/solid/terms#>.
+@prefix ex: <http://www.example.org/terms#>.
+
+_:patch
+
+      solid:inserts {
+        <https://pod.test/alice/bookmarks#f7a4eeb7> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/01/bookmark#Bookmark> .
+        <https://pod.test/alice/bookmarks#f7a4eeb7> <http://purl.org/dc/terms/title> "My favorite website" .
+        <https://pod.test/alice/bookmarks#f7a4eeb7> <http://www.w3.org/2002/01/bookmark#recalls> <https://favorite.example> .
+        <https://pod.test/alice/bookmarks#f7a4eeb7> <http://purl.org/dc/terms/created> "2024-01-02T03:04:05.678Z"^^<http://www.w3.org/2001/XMLSchema#dateTime> .
+      };   a solid:InsertDeletePatch .`,
     );
   });
 });
diff --git a/bookmarks/rdflib/src/test-support/expectRequests.ts b/bookmarks/rdflib/src/test-support/expectRequests.ts
diff --git a/bookmarks/rdflib/src/test-support/mockResponses.ts b/bookmarks/rdflib/src/test-support/mockResponses.ts
diff --git a/bookmarks/rdflib/tsconfig.json b/bookmarks/rdflib/tsconfig.json
@@ -2,16 +2,15 @@
   "compilerOptions": {
     "outDir": "dist",
     "target": "es2020",
-    "lib": [
-      "es2020", "DOM"
-    ],
+    "lib": ["es2020", "DOM"],
     "module": "ES2020",
-    "moduleResolution": "Node",
+    "moduleResolution": "bundler",
     "strict": true,
     "sourceMap": true,
     "allowSyntheticDefaultImports": true,
-    "declaration": true
+    "declaration": true,
+    "allowJs": true
   },
   "include": ["src/**/*"],
-  "exclude": ["**/*.spec.ts", "src/test-support", "src/e2e-tests"],
+  "exclude": ["**/*.spec.ts", "src/e2e-tests"]
 }