From 3c91c2ab42dbf8947d0004052351387b06fae4b5 Mon Sep 17 00:00:00 2001 From: Lucas Azzola Date: Thu, 28 Sep 2017 19:30:51 +1000 Subject: [PATCH] Fix unit tests on Windows (#2922) --- tests_integration/__tests__/config-invalid.js | 2 +- tests_integration/__tests__/config-resolution.js | 2 ++ tests_integration/__tests__/invalid-ignore.js | 2 +- tests_integration/{cwd-serializer.js => path-serializer.js} | 3 ++- 4 files changed, 6 insertions(+), 3 deletions(-) rename tests_integration/{cwd-serializer.js => path-serializer.js} (61%) diff --git a/tests_integration/__tests__/config-invalid.js b/tests_integration/__tests__/config-invalid.js index 29a5db17..7c1ab94c 100644 --- a/tests_integration/__tests__/config-invalid.js +++ b/tests_integration/__tests__/config-invalid.js @@ -2,7 +2,7 @@ const runPrettier = require("../runPrettier"); -expect.addSnapshotSerializer(require("../cwd-serializer")); +expect.addSnapshotSerializer(require("../path-serializer")); test("throw error with invalid config format", () => { const output = runPrettier("cli/config/invalid", [ diff --git a/tests_integration/__tests__/config-resolution.js b/tests_integration/__tests__/config-resolution.js index 437930a8..fff56fbe 100644 --- a/tests_integration/__tests__/config-resolution.js +++ b/tests_integration/__tests__/config-resolution.js @@ -5,6 +5,8 @@ const path = require("path"); const runPrettier = require("../runPrettier"); const prettier = require("../../"); +expect.addSnapshotSerializer(require("../path-serializer")); + test("resolves configuration from external files", () => { const output = runPrettier("cli/config/", ["**/*.js"]); expect(output.stdout).toMatchSnapshot(); diff --git a/tests_integration/__tests__/invalid-ignore.js b/tests_integration/__tests__/invalid-ignore.js index 255f9480..874fbe97 100644 --- a/tests_integration/__tests__/invalid-ignore.js +++ b/tests_integration/__tests__/invalid-ignore.js @@ -2,7 +2,7 @@ const runPrettier = require("../runPrettier"); -expect.addSnapshotSerializer(require("../cwd-serializer")); +expect.addSnapshotSerializer(require("../path-serializer")); test("throw error with invalid ignore", () => { const result = runPrettier("cli/invalid-ignore", ["something.js"]); diff --git a/tests_integration/cwd-serializer.js b/tests_integration/path-serializer.js similarity index 61% rename from tests_integration/cwd-serializer.js rename to tests_integration/path-serializer.js index 4cd7009a..5158a825 100644 --- a/tests_integration/cwd-serializer.js +++ b/tests_integration/path-serializer.js @@ -2,7 +2,8 @@ module.exports = { test: value => - typeof value === "string" && value.indexOf(process.cwd()) !== -1, + typeof value === "string" && + (value.indexOf("\\") > -1 || value.indexOf(process.cwd()) > -1), print: (value, serializer) => serializer(value.replace(process.cwd(), "").replace(/\\/g, "/")) };