Merge pull request #248 from pimterry/fix-tests

chore: fix tests (by fixing error paths generally) when run in paths with spaces

Author: philsturgeon

lib/pointer.js

@@ -91,7 +91,7 @@ Pointer.prototype.resolve = function (obj, options, pathFromRoot) {
     let token = tokens[i];
     if (this.value[token] === undefined || this.value[token] === null) {
       this.value = null;
-      throw new MissingPointerError(token, this.originalPath);
+      throw new MissingPointerError(token, decodeURI(this.originalPath));
     }
     else {
       this.value = this.value[token];

lib/ref.js

@@ -135,7 +135,7 @@ $Ref.prototype.resolve = function (path, options, friendlyPath, pathFromRoot) {
     if (err instanceof InvalidPointerError) {
       // this is a special case - InvalidPointerError is thrown when dereferencing external file,
       // but the issue is caused by the source file that referenced the file that undergoes dereferencing
-      err.source = stripHash(pathFromRoot);
+      err.source = decodeURI(stripHash(pathFromRoot));
     }
 
     this.addError(err);

lib/resolve-external.js

@@ -120,7 +120,7 @@ async function resolve$Ref ($ref, path, $refs, options) {
     }
 
     if ($refs._$refs[withoutHash]) {
-      err.source = url.stripHash(path);
+      err.source = decodeURI(url.stripHash(path));
       err.path = url.safePointerToPath(url.getHash(path));
     }
 

test/specs/error-source/error-source.spec.js

@@ -8,7 +8,6 @@ const { expect } = chai;
 const $RefParser = require("../../..");
 const helper = require("../../utils/helper");
 const path = require("../../utils/path");
-const { host } = require("@jsdevtools/host-environment");
 const { InvalidPointerError, ResolverError, MissingPointerError } = require("../../../lib/util/errors");
 
 
@@ -31,12 +30,6 @@ describe("Report correct error source and path for", () => {
     }
   });
 
-  if (host.node && host.os.windows && path.cwd().includes(" ")) {
-    // The tests below don't support Windows file paths that contain spaces.
-    // TODO: Fix the tests below, rather than skipping them
-    return;
-  }
-
   it("schema with a local reference pointing at property with broken external reference", async () => {
     const parser = new $RefParser();
     try {