From 07d34f3697c424af8150239820c8110e9d3e46fc Mon Sep 17 00:00:00 2001 From: Josh Johnson Date: Mon, 6 Jul 2020 22:14:58 -0400 Subject: [PATCH] Normalize Line Endings Again Tests are working on Windows, but not Ubuntu for some reason. --- src/test/extension.test.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/test/extension.test.ts b/src/test/extension.test.ts index dac0a9a..04d7bff 100644 --- a/src/test/extension.test.ts +++ b/src/test/extension.test.ts @@ -124,20 +124,20 @@ describe("V2XmlFormatter", () => { }); function testFormatter(xmlFormatter: XmlFormatter, options: XmlFormattingOptions, fileLabel: string): void { - const expectedFormattedXml = TestDataLoader.load(`${fileLabel}.formatted.xml`); + const expectedFormattedXml = TestDataLoader.load(`${fileLabel}.formatted.xml`).replace(/\r/, ""); const unformattedXml = TestDataLoader.load(`${fileLabel}.unformatted.xml`); - const actualFormattedXml = xmlFormatter.formatXml(unformattedXml, options); + const actualFormattedXml = xmlFormatter.formatXml(unformattedXml, options).replace(/\r/, ""); // tslint:disable-next-line assert.ok((actualFormattedXml === expectedFormattedXml), `Actual formatted XML does not match expected formatted XML.\n\nACTUAL\n${actualFormattedXml}\n\nEXPECTED\n${expectedFormattedXml}`); } function testMinifier(xmlFormatter: XmlFormatter, options: XmlFormattingOptions, fileLabel: string): void { - const expectedMinifiedXml = TestDataLoader.load(`${fileLabel}.minified.xml`); + const expectedMinifiedXml = TestDataLoader.load(`${fileLabel}.minified.xml`).replace(/\r/, ""); const unminifiedXml = TestDataLoader.load(`${fileLabel}.unminified.xml`); - const actualMinifiedXml = xmlFormatter.minifyXml(unminifiedXml, options); + const actualMinifiedXml = xmlFormatter.minifyXml(unminifiedXml, options).replace(/\r/, ""); // tslint:disable-next-line assert.ok((actualMinifiedXml === expectedMinifiedXml), `Actual minified XML does not match expected minified XML.\n\nACTUAL\n${actualMinifiedXml}\n\nEXPECTED\n${expectedMinifiedXml}`);