Skip to content

Unixify paths in tests #179

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Parent: [rereference] add new method rereference (opposite of dereference)
merged 1 commit into from
Jun 2, 2020
Merged

Unixify paths in tests #179

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions test/specs/error-source/error-source.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ describe("Report correct error source and path for", () => {
expect(err.errors).to.containSubset([
{
name: ResolverError.name,
source: path.abs("specs/error-source/broken-external.json"),
source: path.unixify(path.abs("specs/error-source/broken-external.json")),
path: ["components", "schemas", "testSchema", "properties", "test"],
message: message => typeof message === "string",
},
Expand All @@ -56,13 +56,13 @@ describe("Report correct error source and path for", () => {
expect(err.errors).to.containSubset([
{
name: MissingPointerError.name,
source: path.abs("specs/error-source/invalid-external.json"),
source: path.unixify(path.abs("specs/error-source/invalid-external.json")),
path: ["foo", "bar"],
message: message => typeof message === "string",
},
{
name: ResolverError.name,
source: path.abs("specs/error-source/broken-external.json"),
source: path.unixify(path.abs("specs/error-source/broken-external.json")),
path: ["components", "schemas", "testSchema", "properties", "test"],
message: message => typeof message === "string",
},
Expand All @@ -80,7 +80,7 @@ describe("Report correct error source and path for", () => {
expect(err.errors).to.containSubset([
{
name: InvalidPointerError.name,
source: path.abs("specs/error-source/invalid-pointer.json"),
source: path.unixify(path.abs("specs/error-source/invalid-pointer.json")),
path: ["foo", "baz"],
message: message => typeof message === "string",
},
Expand Down
2 changes: 1 addition & 1 deletion test/specs/invalid-pointers/invalid-pointers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ describe("Schema with invalid pointers", () => {
name: InvalidPointerError.name,
message: "Invalid $ref pointer \"f\". Pointers must begin with \"#/\"",
path: ["foo"],
source: path.abs("specs/invalid-pointers/invalid.json"),
source: path.unixify(path.abs("specs/invalid-pointers/invalid.json")),
}
]);
}
Expand Down
13 changes: 13 additions & 0 deletions test/utils/path.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,13 @@ function filesystemPathHelpers () {
return file;
},

/**
* Returns the path with normalized, UNIX-like, slashes. Disk letter is lower-cased, if present.
*/
unixify (file) {
return file.replace(/\\/g, "/").replace(/^[A-Z](?=:\/)/, (letter) => letter.toLowerCase());
},

/**
* Returns the path of a file in the "test" directory as a URL.
* (e.g. "file://path/to/json-schema-ref-parser/test/files...")
Expand Down Expand Up @@ -111,6 +118,12 @@ function urlPathHelpers () {
return testsDir + encodePath(file);
},

/**
* Does nothing. Needed to comply with Filesystem path helpers.
*/
unixify (file) {
return file;
},
/**
* Returns the path of a file in the "test" directory as an absolute URL.
* (e.g. "http://localhost/test/files/...")
Expand Down