Bump dependencies to fix failing tests

comunica · Oct 18, 2024 · 687709b · 687709b
1 parent fdae0ee
commit 687709b
Show file tree

Hide file tree

Showing 5 changed files with 240 additions and 110 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -12,7 +12,7 @@ jobs:
           key: ${{ runner.os }}-lint-modules-${{ hashFiles('**/yarn.lock') }}
       - uses: actions/setup-node@v2
         with:
-          node-version: 14.x
+          node-version: 18.x
       - run: yarn install
       - run: yarn run lint
 
@@ -22,8 +22,6 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         node-version:
-          - 14.x
-          - 16.x
           - 18.x
           - 20.x
           - 22.x

diff --git a/lib/ILdfManifest.ts b/lib/ILdfManifest.ts
@@ -1,4 +1,4 @@
-import { Resource } from "rdf-object";
+import { RdfObjectLoader, Resource } from "rdf-object";
 import { IFetchOptions, IManifest, ITestCase, ITestCaseHandler,
   manifestFromSpecificationResource, Util } from "rdf-test-suite";
 import { LdfResponseMockerFactory } from "./factory/LdfResponseMockerFactory";
@@ -10,10 +10,12 @@ import { ILdfTestSuiteConfig } from './LdfTestSuiteRunner';
  * @param {{[uri: string]: ITestCaseHandler<ITestCase<any>>}} testCaseHandlers Handlers for constructing test cases.
  * @param {IFetchOptions} options The fetch options.
  * @param {Resource} resource A resource.
+ * @param objectLoader The RDF object loader.
  * @return {Promise<IManifest>} A promise resolving to a manifest object.
  */
-export async function ldfManifestFromResource(testCaseHandlers: {[uri: string]: ITestCaseHandler<ITestCase<any>>},
-                                              options: IFetchOptions & ILdfTestSuiteConfig, resource: Resource):
+export async function ldfManifestFromResource(testCaseHandlers: { [p: string]: ITestCaseHandler<ITestCase<any>> },
+                                              options: IFetchOptions & ILdfTestSuiteConfig, resource: Resource,
+                                              objectLoader: RdfObjectLoader):
   Promise<IManifest> {
   // The factory will allow each ITestCase to setup a mocking server if needed
   const factory: LdfResponseMockerFactory = new LdfResponseMockerFactory(options);
@@ -25,7 +27,7 @@ export async function ldfManifestFromResource(testCaseHandlers: {[uri: string]:
         resource.property.specifications.list
           .map((specificationResource: Resource) =>
             ({ [specificationResource.term.value]:
-              manifestFromSpecificationResource(testCaseHandlers, options, specificationResource) }))))) : null,
+              manifestFromSpecificationResource(testCaseHandlers, options, specificationResource, objectLoader) }))))) : null,
     subManifests: await Promise.all<IManifest>([].concat.apply([],
       resource.properties.include.map((includeList: Resource) => includeList.list
         .map(ldfManifestFromResource.bind(null, factory, testCaseHandlers, options))))),

diff --git a/lib/LdfManifestLoader.ts b/lib/LdfManifestLoader.ts
@@ -33,7 +33,7 @@ export class LdfManifestLoader extends ManifestLoader {
     const objectLoader = new RdfObjectLoader({ context: LdfManifestLoader.LOADER_CONTEXT });
     logger.info(`Importing manifest `);
     const manifest: Resource = await this.import(objectLoader, url, options);
-    return ldfManifestFromResource(this.ldfTestCaseHandlers, options, manifest);
+    return ldfManifestFromResource(this.ldfTestCaseHandlers, options, manifest, objectLoader);
   }
 
 }
diff --git a/package.json b/package.json
@@ -80,7 +80,7 @@
     "jest": "^29.0.0",
     "jest-rdf": "^1.3.0",
     "manual-git-changelog": "^1.0.1",
-    "nock": "^13.0.0",
+    "nock": "^14.0.0-beta.15",
     "pre-commit": "^1.2.2",
     "ts-jest": "^29.0.0",
     "tslint": "^6.0.0",
@@ -96,7 +96,7 @@
     "n3": "^1.6.3",
     "rdf-parse": "^2.0.0",
     "rdf-store-stream": "^2.0.0",
-    "rdf-test-suite": "^1.18.0",
+    "rdf-test-suite": "^1.25.0",
     "tcp-port-used": "^1.0.1",
     "winston": "^3.2.1"
   }