attempt at fixing some tests...

chromaui · May 17, 2024 · c2ad559 · c2ad559
1 parent 3a2bd86
commit c2ad559
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 29 deletions.
diff --git a/node-src/lib/getDependencies.test.ts b/node-src/lib/getDependencies.test.ts
@@ -1,9 +1,10 @@
 import path from 'path';
+
 import { describe, expect, it } from 'vitest';
 
-import { getDependencies } from './getDependencies';
 import packageJson from '../../package.json';
 import { checkoutFile } from '../git/git';
+import { getDependencies } from './getDependencies';
 import TestLogger from './testLogger';
 
 const ctx = { log: new TestLogger() } as any;
@@ -13,7 +14,7 @@ describe('getDependencies', () => {
     const dependencies = await getDependencies(ctx, {
       rootPath: path.join(__dirname, '../../'),
       manifestPath: 'package.json',
-      lockfilePath: 'yarn.lock',
+      lockfilePath: 'pnpm-lock.yaml',
     });
 
     const [dep] = dependencies;
@@ -32,7 +33,7 @@ describe('getDependencies', () => {
     const dependencies = await getDependencies(ctx, {
       rootPath: '/',
       manifestPath: await checkoutFile(ctx, 'HEAD', 'package.json'),
-      lockfilePath: await checkoutFile(ctx, 'HEAD', 'yarn.lock'),
+      lockfilePath: await checkoutFile(ctx, 'HEAD', 'pnpm-lock.yaml'),
     });
 
     const dependencyNames = Array.from(dependencies).map((dependency) => dependency.split('@@')[0]);
@@ -51,7 +52,7 @@ describe('getDependencies', () => {
     const dependencies = await getDependencies(ctx, {
       rootPath: '/',
       manifestPath: await checkoutFile(ctx, commit, 'package.json'),
-      lockfilePath: await checkoutFile(ctx, commit, 'yarn.lock'),
+      lockfilePath: await checkoutFile(ctx, commit, 'pnpm-lock.yaml'),
     });
 
     const dependencyNames = Array.from(dependencies).map((dependency) => dependency.split('@@')[0]);

diff --git a/node-src/lib/getStorybookInfo.test.ts b/node-src/lib/getStorybookInfo.test.ts
@@ -33,7 +33,7 @@ describe('getStorybookInfo', () => {
       expect.objectContaining({
         viewLayer: 'react',
         version: expect.any(String),
-        builder: { name: 'webpack5', packageVersion: '6.5.6' },
+        builder: { name: '@storybook/react-webpack5', packageVersion: '8.1.1' },
       })
     );
   });
@@ -60,13 +60,7 @@ describe('getStorybookInfo', () => {
     const ctx = getContext({ packageJson: { dependencies: VUE } });
     await expect(getStorybookInfo(ctx)).resolves.toEqual(
       expect.objectContaining({
-        addons: [
-          {
-            name: 'viewport',
-            packageName: '@storybook/addon-viewport',
-          },
-        ],
-        builder: { name: 'webpack5', packageVersion: '6.5.6' },
+        builder: { name: '@storybook/react-webpack5', packageVersion: '8.1.1' },
       })
     );
   });
@@ -77,7 +71,7 @@ describe('getStorybookInfo', () => {
       expect.objectContaining({
         viewLayer: 'react',
         version: expect.any(String),
-        builder: { name: 'webpack5', packageVersion: '6.5.6' },
+        builder: { name: '@storybook/react-webpack5', packageVersion: '8.1.1' },
       })
     );
     expect(log.info).toHaveBeenCalledWith(
@@ -94,7 +88,7 @@ describe('getStorybookInfo', () => {
         expect.objectContaining({
           viewLayer: 'react',
           version: '3.2.1',
-          builder: { name: 'webpack5', packageVersion: '6.5.6' },
+          builder: { name: '@storybook/react-webpack5', packageVersion: '8.1.1' },
         })
       );
     });
@@ -105,7 +99,7 @@ describe('getStorybookInfo', () => {
         expect.objectContaining({
           viewLayer: 'react',
           version: '3.2.1',
-          builder: { name: 'webpack5', packageVersion: '6.5.6' },
+          builder: { name: '@storybook/react-webpack5', packageVersion: '8.1.1' },
         })
       );
     });
@@ -114,13 +108,7 @@ describe('getStorybookInfo', () => {
       const ctx = getContext({ env: { CHROMATIC_STORYBOOK_VERSION: '3.2.1' } });
       expect(await getStorybookInfo(ctx)).toEqual(
         expect.objectContaining({
-          addons: [
-            {
-              name: 'viewport',
-              packageName: '@storybook/addon-viewport',
-            },
-          ],
-          builder: { name: 'webpack5', packageVersion: '6.5.6' },
+          builder: { name: '@storybook/react-webpack5', packageVersion: '8.1.1' },
         })
       );
     });
@@ -129,13 +117,7 @@ describe('getStorybookInfo', () => {
       const ctx = getContext({ env: { CHROMATIC_STORYBOOK_VERSION: '@storybook/native@3.2.1' } });
       expect(await getStorybookInfo(ctx)).toEqual(
         expect.objectContaining({
-          addons: [
-            {
-              name: 'viewport',
-              packageName: '@storybook/addon-viewport',
-            },
-          ],
-          builder: { name: 'webpack5', packageVersion: '6.5.6' },
+          builder: { name: '@storybook/react-webpack5', packageVersion: '8.1.1' },
         })
       );
     });

diff --git a/package.json b/package.json
@@ -86,6 +86,7 @@
     "trim-stats": "./dist/bin.js trim-stats-file",
     "storybook": "storybook dev -p 9009",
     "test": "vitest run --coverage && vitest run -c vitest.no-threads.config.ts",
+    "test:watch": "vitest watch --coverage",
     "prepare": "husky install && npm run build",
     "dev": "tsup --watch",
     "lint-staged": "lint-staged"