diff --git a/src/ExifTool.spec.ts b/src/ExifTool.spec.ts index 9da80262..d8a3ceb6 100644 --- a/src/ExifTool.spec.ts +++ b/src/ExifTool.spec.ts @@ -1,14 +1,12 @@ import { BatchCluster } from "batch-cluster" import * as _path from "path" -import { platform } from "process" - -import { expect, testImg } from "./_chai.spec" import { times } from "./Array" import { ExifDateTime } from "./ExifDateTime" import { DefaultMaxProcs, ExifTool, exiftool } from "./ExifTool" import { keys } from "./Object" -import { Tags } from "./Tags" import { leftPad } from "./String" +import { Tags } from "./Tags" +import { expect, isWin32, testImg } from "./_chai.spec" function normalize(tagNames: string[]): string[] { return tagNames @@ -68,7 +66,7 @@ describe("ExifTool", function () { ignoreShebangs.push(true) } else { ignoreShebangs.push(false) - if (platform !== "win32") ignoreShebangs.push(true) + if (!isWin32()) ignoreShebangs.push(true) } for (const ignoreShebang of ignoreShebangs) { diff --git a/src/ReadTask.spec.ts b/src/ReadTask.spec.ts index 5bf77989..1f4fa2b0 100644 --- a/src/ReadTask.spec.ts +++ b/src/ReadTask.spec.ts @@ -5,7 +5,7 @@ import { ExifDateTime } from "./ExifDateTime" import { exiftool, ExifTool } from "./ExifTool" import { ReadTask } from "./ReadTask" import { Tags } from "./Tags" -import { expect } from "./_chai.spec" +import { expect, isWin32 } from "./_chai.spec" function parse(tags: any, err?: Error): Tags { const tt = ReadTask.for("/tmp/example.jpg", []) @@ -262,7 +262,7 @@ describe("ReadTask", () => { describe("quotes in filenames", () => { after(() => exiftool.end()) - const base = `it's a "file".jpg` + const base = isWin32() ? `it's a file.jpg` : `it's a "file".jpg` it("reads from " + base, async () => { const tmp = join(tmpdir(), base) await fse.mkdirp(tmpdir()) diff --git a/src/_chai.spec.ts b/src/_chai.spec.ts index 2730fbc2..eef94fbd 100644 --- a/src/_chai.spec.ts +++ b/src/_chai.spec.ts @@ -1,7 +1,7 @@ import { Deferred, Logger, setLogger } from "batch-cluster" import { createHash } from "crypto" import * as fse from "fs-extra" -import { tmpdir } from "os" +import { platform, tmpdir } from "os" import { join } from "path" import { env } from "process" import { orElse } from "./Maybe" @@ -64,3 +64,7 @@ export function sha1(path: string): Promise { readStream.on("end", () => d.resolve(sha.digest().toString("hex"))) return d.promise } + +export function isWin32() { + return platform() === "win32" +}