From ae10876e0efeda0fae80edd0a63316ff7aae5eb8 Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Tue, 1 Sep 2020 23:15:40 +0200
Subject: [PATCH] cli: make tests work on windows

---
 .../cli/src/commands/create-plugin/createPlugin.test.ts   | 2 +-
 .../cli/src/commands/remove-plugin/removePlugin.test.ts   | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/cli/src/commands/create-plugin/createPlugin.test.ts b/packages/cli/src/commands/create-plugin/createPlugin.test.ts
index 57fa33d173..72b95b072c 100644
--- a/packages/cli/src/commands/create-plugin/createPlugin.test.ts
+++ b/packages/cli/src/commands/create-plugin/createPlugin.test.ts
@@ -59,7 +59,7 @@ describe('createPlugin', () => {
         await createTemporaryPluginFolder(tempDir);
         await movePlugin(tempDir, pluginDir, id);
         await expect(fs.pathExists(pluginDir)).resolves.toBe(true);
-        expect(pluginDir).toMatch(`/plugins\/${id}`);
+        expect(pluginDir).toMatch(path.join('', 'plugins', id));
       } finally {
         await del(tempDir, { force: true });
         await del(rootDir, { force: true });
diff --git a/packages/cli/src/commands/remove-plugin/removePlugin.test.ts b/packages/cli/src/commands/remove-plugin/removePlugin.test.ts
index 72fbc6f084..3ffa8d63cf 100644
--- a/packages/cli/src/commands/remove-plugin/removePlugin.test.ts
+++ b/packages/cli/src/commands/remove-plugin/removePlugin.test.ts
@@ -39,7 +39,7 @@ const testPluginPackage = `${BACKSTAGE}/plugin-${testPluginName}`;
 const tempDir = path.join(os.tmpdir(), 'remove-plugin-test');
 
 const removeEmptyLines = (file: string): string =>
-  file.split('\n').filter(Boolean).join('\n');
+  file.split(/\r?\n/).filter(Boolean).join('\n');
 
 const createTestPackageFile = async (
   testFilePath: string,
@@ -100,7 +100,7 @@ describe('removePlugin', () => {
         const packageFileContent = removeEmptyLines(
           fse.readFileSync(packageFilePath, 'utf8'),
         );
-        expect(testFileContent === packageFileContent).toBe(true);
+        expect(testFileContent).toBe(packageFileContent);
       } finally {
         fse.removeSync(testFilePath);
       }
@@ -117,7 +117,7 @@ describe('removePlugin', () => {
         const pluginsFileContent = removeEmptyLines(
           fse.readFileSync(pluginsFilePaths, 'utf8'),
         );
-        expect(testFileContent === pluginsFileContent).toBe(true);
+        expect(testFileContent).toBe(pluginsFileContent);
       } finally {
         fse.removeSync(testFilePath);
       }
@@ -138,7 +138,7 @@ describe('removePlugin', () => {
           'test@gmail.com',
         ]);
         await removePluginFromCodeOwners(testFilePath, testPluginName);
-        expect(testFileContent === codeOwnersFileContent).toBeTruthy();
+        expect(testFileContent).toBe(codeOwnersFileContent);
       } finally {
         if (fse.existsSync(testFilePath)) fse.removeSync(testFilePath);
       }