fix: Correct unit tests failing on Windows

core/cli/__tests__/cli.test.ts

@@ -1,6 +1,7 @@
 import * as Path from 'path';
 import execa = require('execa');
 import stripAnsi from 'strip-ansi';
+import { normalizeContainedPath } from '@garment/fixture-helper';
 
 const cwd = Path.join(__dirname + '/fixtures/basic');
 const garmentPath = Path.relative(cwd, 'core/cli/lib/cli.js');
@@ -48,12 +49,12 @@ test('cli should fail if given incorrect number of commands', async () => {
   const { stderr } = await execaSafe('node', [garmentPath, noCacheArg], {
     cwd: cwd
   });
-  expect(stderr).toMatchSnapshot();
+  expect(normalizeContainedPath(stderr)).toMatchSnapshot();
 });
 
 test('cli should fail if given unexisting command', async () => {
   const { stderr } = await execaSafe('node', [garmentPath, 'dep', noCacheArg], {
     cwd: cwd
   });
-  expect(stderr).toMatchSnapshot();
+  expect(normalizeContainedPath(stderr)).toMatchSnapshot();
 });

core/cli/package.json

@@ -34,6 +34,7 @@
     "@types/update-notifier": "^2.5.0",
     "@types/yargs": "13.0.3",
     "execa": "^4.0.0",
-    "strip-ansi": "^5.2.0"
+    "strip-ansi": "^5.2.0",
+    "@garment/fixture-helper": "^0.13.8"
   }
 }

jest.config.js

@@ -6,5 +6,6 @@ module.exports = {
     'ts-jest': {
       tsConfig: 'tsconfig.test.json'
     }
-  }
+  },
+  resolver: './utils/fixture-helper/lib/resolver'
 };

plugins/runner-bin/__tests__/utils.test.ts

@@ -1,5 +1,6 @@
 import { parseOptions, resolveBin } from '../src/utils';
 import * as Path from 'path';
+import os = require('os');
 
 describe('parseOptions function ', () => {
   const expectedResult = ['prettier', '-o', '--output-dir', 'index.js'];
@@ -60,7 +61,11 @@ describe('resolveBin function ', () => {
   );
 
   test('if gets bin name returns as resolved bin', async () => {
-    expect(await resolveBin('prettier')).toBe(expectedResult);
+    const expectedPlatformResult = Path.format({
+      name: expectedResult,
+      ext: os.platform() === 'win32' ? '.CMD' : ''
+    });
+    expect(await resolveBin('prettier')).toBe(expectedPlatformResult);
   });
 
   test('if gets bin path returns as fullPath', async () => {

plugins/runner-jest/__tests__/getConfig.test.ts

@@ -1,4 +1,8 @@
-import { createBatchContext, initFixtureHelper } from '@garment/fixture-helper';
+import {
+  createBatchContext,
+  initFixtureHelper,
+  replaceTestPath
+} from '@garment/fixture-helper';
 import { getConfig, JestRunnerOptions } from '../src';
 
 const { initFixture, clean } = initFixtureHelper(module, {
@@ -37,15 +41,3 @@ test('Handles multiple projects sharing the same config and one having different
 
   expect(replaceTestPath(jestConfig, cwd)).toMatchSnapshot();
 });
-
-function replaceTestPath<T>(
-  obj: T,
-  testPath: string,
-  replaceWith = '/test_path'
-): T {
-  return JSON.parse(
-    JSON.stringify(obj, (_, value) =>
-      typeof value === 'string' ? value.replace(testPath, replaceWith) : value
-    )
-  );
-}

plugins/runner-postcss/__tests__/__snapshots__/default.test.ts.snap

@@ -5,7 +5,7 @@ Object {
   "collectedOutput": Array [
     Object {
       "cacheKeys": Array [
-        "8de170ce8b6d1c1aeb78d959f4faa0cf",
+        "mockHash",
         "
           @import './test.css'; 
           .Slideshow {
@@ -60,7 +60,7 @@ Object {
   "collectedOutput": Array [
     Object {
       "cacheKeys": Array [
-        "e1c061eef28e0cce2b1ff22fb7f6e12c",
+        "mockHash",
         "
           :root {
             --color: red;
@@ -111,7 +111,7 @@ Object {
   "collectedOutput": Array [
     Object {
       "cacheKeys": Array [
-        "8de170ce8b6d1c1aeb78d959f4faa0cf",
+        "mockHash",
         ":fullscreen {}",
         "index.css",
       ],

plugins/runner-postcss/__tests__/default.test.ts

@@ -1,6 +1,11 @@
-import { executeRunner2, initFixtureHelper } from '@garment/fixture-helper';
+import {
+  executeRunner2,
+  initFixtureHelper,
+  ExecuteRunner2Result
+} from '@garment/fixture-helper';
 import * as Path from 'path';
 import handler from '../src';
+import os = require('os');
 
 const { initFixture, clean } = initFixtureHelper(module, {
   tempDir: __dirname + 'tmp__'
@@ -21,7 +26,15 @@ test('Uses postcss.config.js from workspace root', async () => {
     files: file => [file.text('index.css', `:fullscreen {}`)]
   });
 
+  const [hash] = extractHashes(result, 'mockHash');
+
   expect(result).toMatchSnapshot();
+
+  if (os.platform() === 'win32') {
+    expect(hash).toBe('b2fa5e79e89879036728c19a038eafac');
+  } else {
+    expect(hash).toBe('8de170ce8b6d1c1aeb78d959f4faa0cf');
+  }
 });
 
 test('Uses postcss.config.js from project', async () => {
@@ -47,7 +60,15 @@ test('Uses postcss.config.js from project', async () => {
     }
   );
 
+  const [hash] = extractHashes(result, 'mockHash');
+
   expect(result).toMatchSnapshot();
+
+  if (os.platform() === 'win32') {
+    expect(hash).toBe('85e0de080544f7c03f6fa022840ccdaa');
+  } else {
+    expect(hash).toBe('e1c061eef28e0cce2b1ff22fb7f6e12c');
+  }
 });
 
 test('Resolves postcss @import', async () => {
@@ -74,5 +95,38 @@ test('Resolves postcss @import', async () => {
     ]
   });
 
+  const [hash] = extractHashes(result, 'mockHash');
+
   expect(result).toMatchSnapshot();
+
+  if (os.platform() === 'win32') {
+    expect(hash).toBe('b2fa5e79e89879036728c19a038eafac');
+  } else {
+    expect(hash).toBe('8de170ce8b6d1c1aeb78d959f4faa0cf');
+  }
 });
+
+function extractHashes(
+  result: ExecuteRunner2Result,
+  replacement: string
+): string[] {
+  const { collectedOutput } = result;
+  const md5Regex = /^[a-f0-9]{32}$/i;
+
+  const originalHashes: string[] = [];
+
+  collectedOutput.forEach((output: any) => {
+    if (output.hasOwnProperty('cacheKeys')) {
+      output.cacheKeys = output.cacheKeys.map((cacheKey: string) => {
+        if (md5Regex.test(cacheKey)) {
+          originalHashes.push(cacheKey);
+          return replacement;
+        } else {
+          return cacheKey;
+        }
+      });
+    }
+  });
+
+  return originalHashes;
+}

plugins/runner-ts/__tests__/__snapshots__/default.test.ts.snap

@@ -104,6 +104,58 @@ Object {
 }
 `;
 
+exports[`Transpiles TypeScript when configFile contains npm module in extends field 1`] = `
+Object {
+  "collectedOutput": Array [
+    Object {
+      "cacheKeys": Array [
+        "3.8.3",
+        "{\\"declaration\\":true,\\"sourceMap\\":true,\\"noEmitOnError\\":true,\\"skipLibCheck\\":true,\\"target\\":\\"es5\\",\\"module\\":\\"esnext\\",\\"moduleResolution\\":\\"node\\"}",
+        "export const greet = (str: string) => \`Hello, \${str}\`",
+      ],
+      "dependencies": Array [],
+      "files": Array [
+        Object {
+          "data": "{\\"version\\":3,\\"file\\":\\"index.js\\",\\"sourceRoot\\":\\"\\",\\"sources\\":[\\"index.ts\\"],\\"names\\":[],\\"mappings\\":\\"AAAA,MAAM,CAAC,IAAM,KAAK,GAAG,UAAC,GAAW,IAAK,OAAA,YAAU,GAAK,EAAf,CAAe,CAAA\\"}",
+          "path": "nested/index.js.map",
+          "type": "text",
+        },
+        Object {
+          "data": "export var greet = function (str) { return \\"Hello, \\" + str; };
+//# sourceMappingURL=index.js.map",
+          "path": "nested/index.js",
+          "type": "text",
+        },
+        Object {
+          "data": "export declare const greet: (str: string) => string;
+",
+          "path": "nested/index.d.ts",
+          "type": "text",
+        },
+      ],
+      "logs": Array [],
+    },
+  ],
+  "dependsOnFile": Array [
+    "/test_path/tsconfig.json",
+    "/test_path/node_modules/@my-scope/tsconfig/tsconfig.base.json",
+    "/test_path/node_modules/@my-scope/tsconfig/tsconfig.common.json",
+  ],
+  "isLongRunning": false,
+  "logs": Array [
+    Object {
+      "args": Array [
+        "[TS] Processing",
+        "index.ts",
+      ],
+      "level": "debug",
+    },
+  ],
+  "onDestroyHandler": undefined,
+  "shouldWatchDependencies": false,
+}
+`;
+
 exports[`Transpiles TypeScript with relative imports including not provided as input 1`] = `
 Object {
   "collectedOutput": Array [

plugins/runner-ts/__tests__/default.test.ts

@@ -3,7 +3,7 @@ import * as Path from 'path';
 import handler from '../src';
 
 const { initFixture, clean } = initFixtureHelper(module, {
-  tempDir: __dirname + 'tmp__'
+  tempDir: Path.join(__dirname, 'tmp__')
 });
 
 afterAll(clean);
@@ -85,3 +85,30 @@ test('Transpiles TypeScript', async () => {
 
   expect(result).toMatchSnapshot();
 });
+
+test('Transpiles TypeScript when configFile contains npm module in extends field', async () => {
+  const cwd = await initFixture('config-extends-npm-module', { staticId: 0 });
+
+  const src = (p = '') => Path.join(cwd, 'test-project', 'src', p);
+
+  const result = await executeRunner2(
+    handler,
+    { configFile: 'tsconfig.json' },
+    {
+      projectRelativePath: 'test-project',
+      cwd,
+      files: file => [
+        file.text(
+          'index.ts',
+          'export const greet = (str: string) => `Hello, ${str}`',
+          {
+            absolutePath: src('nested/index.ts'),
+            baseDir: src()
+          }
+        )
+      ]
+    }
+  );
+
+  expect(result).toMatchSnapshot();
+});

plugins/runner-ts/__tests__/fixtures/config-extends-npm-module/tsconfig.json

@@ -0,0 +1,6 @@
+{
+  "extends": "@my-scope/tsconfig/tsconfig.base.json",
+  "compilerOptions": {
+    "target": "es5"
+  }
+}

plugins/runner-ts/__tests__/module-resolution.json

@@ -0,0 +1,4 @@
+{
+    "@my-scope/tsconfig/tsconfig.base.json": "tmp__/default-config-extends-npm-module-0/node_modules/@my-scope/tsconfig/tsconfig.base.json",
+    "@my-scope/tsconfig/tsconfig.common.json": "tmp__/default-config-extends-npm-module-0/node_modules/@my-scope/tsconfig/tsconfig.common.json"
+}