From 66a68fcd50ada25d320757911eddbe157dada82e Mon Sep 17 00:00:00 2001 From: John Simons Date: Mon, 28 Mar 2022 12:26:33 +1000 Subject: [PATCH] Fix path separators --- .../OctoInstallerV5/installer.test.ts | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/source/tasks/OctoInstaller/OctoInstallerV5/installer.test.ts b/source/tasks/OctoInstaller/OctoInstallerV5/installer.test.ts index bc553d5e..60abaddd 100644 --- a/source/tasks/OctoInstaller/OctoInstallerV5/installer.test.ts +++ b/source/tasks/OctoInstaller/OctoInstallerV5/installer.test.ts @@ -94,19 +94,25 @@ describe("OctoInstaller", () => { test("Installs specific version", async () => { const output = await executeCommand(() => new Installer(octopusUrl).run("8.0.0")); - expect(output).toContain("/8.0.0/OctopusTools."); - expect(output).toContain("/octo/8.0.0"); + assertions(output, "8.0.0"); }); test("Installs wildcard version", async () => { const output = await executeCommand(() => new Installer(octopusUrl).run("7.*")); - expect(output).toContain("/7.4.1/OctopusTools."); - expect(output).toContain("/octo/7.4.1"); + assertions(output, "7.4.1"); }); test("Installs latest of latest", async () => { const output = await executeCommand(() => new Installer(octopusUrl).run("*")); - expect(output).toContain("/8.2.0/OctopusTools."); - expect(output).toContain("/octo/8.2.0"); + assertions(output, "8.2.0"); }); + + function assertions(output: string, version: string) { + expect(output).toContain(toPath([version, "OctopusTools."])); + expect(output).toContain(toPath(["octo", version])); + } + + function toPath(parts: string[]) { + return `${path.sep}${parts.join(path.sep)}`; + } });