Fix Angular tests for Windows

Marklb · Dec 4, 2021 · e432ea0 · e432ea0
1 parent b39cfdc
commit e432ea0
Showing 1 changed file with 110 additions and 34 deletions.
diff --git a/app/angular/src/server/framework-preset-angular-cli.test.ts b/app/angular/src/server/framework-preset-angular-cli.test.ts
@@ -1,4 +1,5 @@
 /* eslint-disable jest/no-interpolation-in-snapshots */
+import p from 'path';
 import { Configuration } from 'webpack';
 import { logger } from '@storybook/node-logger';
 import TsconfigPathsPlugin from 'tsconfig-paths-webpack-plugin';
@@ -263,18 +264,18 @@ describe('framework-preset-angular-cli', () => {
 
       expect(webpackFinalConfig.resolve.modules).toEqual([
         ...baseWebpackConfig.resolve.modules,
-        `${workspaceRoot}/src`,
+        p.resolve(`${workspaceRoot}/src`).replace(/\\/g, '/'),
       ]);
     });
 
-    it('should replace webpack "resolve.plugins"', async () => {
+    it('should replace webpack resolve.plugins', async () => {
       const baseWebpackConfig = newWebpackConfiguration();
       const webpackFinalConfig = await webpackFinal(baseWebpackConfig, options);
 
       expect(webpackFinalConfig.resolve.plugins).toMatchInlineSnapshot(`
         Array [
           TsconfigPathsPlugin {
-            "absoluteBaseUrl": "${workspaceRoot}/src/",
+            "absoluteBaseUrl": "${p.normalize(`${workspaceRoot}/src/`).replace(/\\/g, '\\\\')}",
             "baseUrl": "./",
             "extensions": Array [
               ".ts",
@@ -307,8 +308,8 @@ describe('framework-preset-angular-cli', () => {
         ...baseWebpackConfig,
         entry: [
           ...(baseWebpackConfig.entry as any[]),
-          `${workspaceRoot}/src/styles.css`,
-          `${workspaceRoot}/src/styles.scss`,
+          p.resolve(`${workspaceRoot}/src/styles.css`),
+          p.resolve(`${workspaceRoot}/src/styles.scss`),
         ],
         module: { ...baseWebpackConfig.module, rules: expect.anything() },
         plugins: expect.anything(),
@@ -328,42 +329,66 @@ describe('framework-preset-angular-cli', () => {
 
       expect(webpackFinalConfig.module.rules).toEqual([
         {
-          exclude: [`${workspaceRoot}/src/styles.css`, `${workspaceRoot}/src/styles.scss`],
+          exclude: [
+            p.resolve(`${workspaceRoot}/src/styles.css`),
+            p.resolve(`${workspaceRoot}/src/styles.scss`),
+          ],
           test: /\.css$/,
           use: expect.anything(),
         },
         {
-          exclude: [`${workspaceRoot}/src/styles.css`, `${workspaceRoot}/src/styles.scss`],
+          exclude: [
+            p.resolve(`${workspaceRoot}/src/styles.css`),
+            p.resolve(`${workspaceRoot}/src/styles.scss`),
+          ],
           test: /\.scss$|\.sass$/,
           use: expect.anything(),
         },
         {
-          exclude: [`${workspaceRoot}/src/styles.css`, `${workspaceRoot}/src/styles.scss`],
+          exclude: [
+            p.resolve(`${workspaceRoot}/src/styles.css`),
+            p.resolve(`${workspaceRoot}/src/styles.scss`),
+          ],
           test: /\.less$/,
           use: expect.anything(),
         },
         {
-          exclude: [`${workspaceRoot}/src/styles.css`, `${workspaceRoot}/src/styles.scss`],
+          exclude: [
+            p.resolve(`${workspaceRoot}/src/styles.css`),
+            p.resolve(`${workspaceRoot}/src/styles.scss`),
+          ],
           test: /\.styl$/,
           use: expect.anything(),
         },
         {
-          include: [`${workspaceRoot}/src/styles.css`, `${workspaceRoot}/src/styles.scss`],
+          include: [
+            p.resolve(`${workspaceRoot}/src/styles.css`),
+            p.resolve(`${workspaceRoot}/src/styles.scss`),
+          ],
           test: /\.css$/,
           use: expect.anything(),
         },
         {
-          include: [`${workspaceRoot}/src/styles.css`, `${workspaceRoot}/src/styles.scss`],
+          include: [
+            p.resolve(`${workspaceRoot}/src/styles.css`),
+            p.resolve(`${workspaceRoot}/src/styles.scss`),
+          ],
           test: /\.scss$|\.sass$/,
           use: expect.anything(),
         },
         {
-          include: [`${workspaceRoot}/src/styles.css`, `${workspaceRoot}/src/styles.scss`],
+          include: [
+            p.resolve(`${workspaceRoot}/src/styles.css`),
+            p.resolve(`${workspaceRoot}/src/styles.scss`),
+          ],
           test: /\.less$/,
           use: expect.anything(),
         },
         {
-          include: [`${workspaceRoot}/src/styles.css`, `${workspaceRoot}/src/styles.scss`],
+          include: [
+            p.resolve(`${workspaceRoot}/src/styles.css`),
+            p.resolve(`${workspaceRoot}/src/styles.scss`),
+          ],
           test: /\.styl$/,
           use: expect.anything(),
         },
@@ -398,8 +423,8 @@ describe('framework-preset-angular-cli', () => {
         ...baseWebpackConfig,
         entry: [
           ...(baseWebpackConfig.entry as any[]),
-          `${workspaceRoot}/src/styles.css`,
-          `${workspaceRoot}/src/styles.scss`,
+          p.resolve(`${workspaceRoot}/src/styles.css`),
+          p.resolve(`${workspaceRoot}/src/styles.scss`),
         ],
         module: { ...baseWebpackConfig.module, rules: expect.anything() },
         plugins: expect.anything(),
@@ -419,42 +444,66 @@ describe('framework-preset-angular-cli', () => {
 
       expect(webpackFinalConfig.module.rules).toEqual([
         {
-          exclude: [`${workspaceRoot}/src/styles.css`, `${workspaceRoot}/src/styles.scss`],
+          exclude: [
+            p.resolve(`${workspaceRoot}/src/styles.css`),
+            p.resolve(`${workspaceRoot}/src/styles.scss`),
+          ],
           test: /\.css$/,
           use: expect.anything(),
         },
         {
-          exclude: [`${workspaceRoot}/src/styles.css`, `${workspaceRoot}/src/styles.scss`],
+          exclude: [
+            p.resolve(`${workspaceRoot}/src/styles.css`),
+            p.resolve(`${workspaceRoot}/src/styles.scss`),
+          ],
           test: /\.scss$|\.sass$/,
           use: expect.anything(),
         },
         {
-          exclude: [`${workspaceRoot}/src/styles.css`, `${workspaceRoot}/src/styles.scss`],
+          exclude: [
+            p.resolve(`${workspaceRoot}/src/styles.css`),
+            p.resolve(`${workspaceRoot}/src/styles.scss`),
+          ],
           test: /\.less$/,
           use: expect.anything(),
         },
         {
-          exclude: [`${workspaceRoot}/src/styles.css`, `${workspaceRoot}/src/styles.scss`],
+          exclude: [
+            p.resolve(`${workspaceRoot}/src/styles.css`),
+            p.resolve(`${workspaceRoot}/src/styles.scss`),
+          ],
           test: /\.styl$/,
           use: expect.anything(),
         },
         {
-          include: [`${workspaceRoot}/src/styles.css`, `${workspaceRoot}/src/styles.scss`],
+          include: [
+            p.resolve(`${workspaceRoot}/src/styles.css`),
+            p.resolve(`${workspaceRoot}/src/styles.scss`),
+          ],
           test: /\.css$/,
           use: expect.anything(),
         },
         {
-          include: [`${workspaceRoot}/src/styles.css`, `${workspaceRoot}/src/styles.scss`],
+          include: [
+            p.resolve(`${workspaceRoot}/src/styles.css`),
+            p.resolve(`${workspaceRoot}/src/styles.scss`),
+          ],
           test: /\.scss$|\.sass$/,
           use: expect.anything(),
         },
         {
-          include: [`${workspaceRoot}/src/styles.css`, `${workspaceRoot}/src/styles.scss`],
+          include: [
+            p.resolve(`${workspaceRoot}/src/styles.css`),
+            p.resolve(`${workspaceRoot}/src/styles.scss`),
+          ],
           test: /\.less$/,
           use: expect.anything(),
         },
         {
-          include: [`${workspaceRoot}/src/styles.css`, `${workspaceRoot}/src/styles.scss`],
+          include: [
+            p.resolve(`${workspaceRoot}/src/styles.css`),
+            p.resolve(`${workspaceRoot}/src/styles.scss`),
+          ],
           test: /\.styl$/,
           use: expect.anything(),
         },
@@ -476,8 +525,8 @@ describe('framework-preset-angular-cli', () => {
         ...baseWebpackConfig,
         entry: [
           ...(baseWebpackConfig.entry as any[]),
-          `${workspaceRoot}/src/styles.css`,
-          `${workspaceRoot}/src/styles.scss`,
+          p.resolve(`${workspaceRoot}/src/styles.css`),
+          p.resolve(`${workspaceRoot}/src/styles.scss`),
         ],
         module: { ...baseWebpackConfig.module, rules: expect.anything() },
         plugins: expect.anything(),
@@ -501,42 +550,66 @@ describe('framework-preset-angular-cli', () => {
 
       expect(webpackFinalConfig.module.rules).toEqual([
         {
-          exclude: [`${workspaceRoot}/src/styles.css`, `${workspaceRoot}/src/styles.scss`],
+          exclude: [
+            p.resolve(`${workspaceRoot}/src/styles.css`),
+            p.resolve(`${workspaceRoot}/src/styles.scss`),
+          ],
           test: /\.css$/,
           use: expect.anything(),
         },
         {
-          exclude: [`${workspaceRoot}/src/styles.css`, `${workspaceRoot}/src/styles.scss`],
+          exclude: [
+            p.resolve(`${workspaceRoot}/src/styles.css`),
+            p.resolve(`${workspaceRoot}/src/styles.scss`),
+          ],
           test: /\.scss$|\.sass$/,
           use: expect.anything(),
         },
         {
-          exclude: [`${workspaceRoot}/src/styles.css`, `${workspaceRoot}/src/styles.scss`],
+          exclude: [
+            p.resolve(`${workspaceRoot}/src/styles.css`),
+            p.resolve(`${workspaceRoot}/src/styles.scss`),
+          ],
           test: /\.less$/,
           use: expect.anything(),
         },
         {
-          exclude: [`${workspaceRoot}/src/styles.css`, `${workspaceRoot}/src/styles.scss`],
+          exclude: [
+            p.resolve(`${workspaceRoot}/src/styles.css`),
+            p.resolve(`${workspaceRoot}/src/styles.scss`),
+          ],
           test: /\.styl$/,
           use: expect.anything(),
         },
         {
-          include: [`${workspaceRoot}/src/styles.css`, `${workspaceRoot}/src/styles.scss`],
+          include: [
+            p.resolve(`${workspaceRoot}/src/styles.css`),
+            p.resolve(`${workspaceRoot}/src/styles.scss`),
+          ],
           test: /\.css$/,
           use: expect.anything(),
         },
         {
-          include: [`${workspaceRoot}/src/styles.css`, `${workspaceRoot}/src/styles.scss`],
+          include: [
+            p.resolve(`${workspaceRoot}/src/styles.css`),
+            p.resolve(`${workspaceRoot}/src/styles.scss`),
+          ],
           test: /\.scss$|\.sass$/,
           use: expect.anything(),
         },
         {
-          include: [`${workspaceRoot}/src/styles.css`, `${workspaceRoot}/src/styles.scss`],
+          include: [
+            p.resolve(`${workspaceRoot}/src/styles.css`),
+            p.resolve(`${workspaceRoot}/src/styles.scss`),
+          ],
           test: /\.less$/,
           use: expect.anything(),
         },
         {
-          include: [`${workspaceRoot}/src/styles.css`, `${workspaceRoot}/src/styles.scss`],
+          include: [
+            p.resolve(`${workspaceRoot}/src/styles.css`),
+            p.resolve(`${workspaceRoot}/src/styles.scss`),
+          ],
           test: /\.styl$/,
           use: expect.anything(),
         },
@@ -699,7 +772,10 @@ describe('framework-preset-angular-cli', () => {
 
         expect(webpackFinalConfig).toEqual({
           ...baseWebpackConfig,
-          entry: [...(baseWebpackConfig.entry as any[]), `${workspaceRoot}/src/styles.css`],
+          entry: [
+            ...(baseWebpackConfig.entry as any[]),
+            p.resolve(`${workspaceRoot}/src/styles.css`),
+          ],
           module: { ...baseWebpackConfig.module, rules: expect.anything() },
           plugins: expect.anything(),
           resolve: {