GitHub/storybook
1
0
Fork 0
mirror of https://github.com/storybookjs/storybook.git synced 2025-04-04 09:11:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

Finalize

Browse Source
This commit is contained in:
Valentin Palkovic 2022-11-09 11:42:46 +01:00
parent 82b4e270ab
commit e7f83454fc
4 changed files with 36 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
code/jest.config.js
View File

@ -1,5 +1,13 @@
const os = require('os'); const os = require('os');
// TODO Revisit this test later, when we have a windows machine @valentinpalkovic
const skipOnWindows = [
'lib/core-server/src/utils/__tests__/server-statics.test.ts',
'lib/core-common/src/utils/__tests__/template.test.ts',
'addons/storyshots/storyshots-core/src/frameworks/configure.test.ts',
'lib/core-common/src/utils/__tests__/interpret-files.test.ts',
];
module.exports = { module.exports = {
cacheDirectory: '.cache/jest', cacheDirectory: '.cache/jest',
clearMocks: true, clearMocks: true,
@ -51,6 +59,7 @@ module.exports = {
'/renderers/svelte/src/public-types.test.ts', '/renderers/svelte/src/public-types.test.ts',
'/renderers/vue/src/public-types.test.ts', '/renderers/vue/src/public-types.test.ts',
'/renderers/vue3/src/public-types.test.ts', '/renderers/vue3/src/public-types.test.ts',
...(process.platform === 'win32' ? skipOnWindows : []),
], ],
collectCoverage: false, collectCoverage: false,
collectCoverageFrom: [ collectCoverageFrom: [

61
code/lib/builder-manager/src/utils/files.test.ts
View File

@ -2,43 +2,28 @@ import { platform } from 'os';
import { sanitizePath } from './files'; import { sanitizePath } from './files';
const os = platform(); const os = platform();
const isWindows = os === 'win32';
if (os !== 'win32') { test('sanitizePath', () => {
test('sanitizePath', () => { const addonsDir = isWindows
const addonsDir = '/Users/username/Projects/projectname/storybook'; ? 'C:\\Users\\username\\Projects\\projectname\\storybook'
const text = 'demo text'; : '/Users/username/Projects/projectname/storybook';
const file = { const text = 'demo text';
path: '/Users/username/Projects/projectname/storybook/node_modules/@storybook/addon-x+y/dist/manager.mjs', const file = {
contents: Uint8Array.from(Array.from(text).map((letter) => letter.charCodeAt(0))), path: isWindows
text, ? 'C:\\Users\\username\\Projects\\projectname\\storybook\\node_modules\\@storybook\\addon-x+y\\dist\\manager.mjs'
}; : '/Users/username/Projects/projectname/storybook/node_modules/@storybook/addon-x+y/dist/manager.mjs',
const { location, url } = sanitizePath(file, addonsDir); contents: Uint8Array.from(Array.from(text).map((letter) => letter.charCodeAt(0))),
text,
};
const { location, url } = sanitizePath(file, addonsDir);
expect(location).toMatchInlineSnapshot( expect(location).toMatchInlineSnapshot(
`"/Users/username/Projects/projectname/storybook/node_modules/@storybook/addon-x+y/dist/manager.mjs"` isWindows
); ? `"C:\\\\Users\\\\username\\\\Projects\\\\projectname\\\\storybook\\\\node_modules\\\\@storybook\\\\addon-x+y\\\\dist\\\\manager.mjs"`
expect(url).toMatchInlineSnapshot( : `"/Users/username/Projects/projectname/storybook/node_modules/@storybook/addon-x+y/dist/manager.mjs"`
`"./sb-addons/node_modules/%40storybook/addon-x%2By/dist/manager.mjs"` );
); expect(url).toMatchInlineSnapshot(
}); `"./sb-addons/node_modules/%40storybook/addon-x%2By/dist/manager.mjs"`
} );
});
if (os === 'win32') {
test('sanitizePath - 1', () => {
const addonsDir = 'C:\\Users\\username\\Projects\\projectname\\storybook';
const text = 'demo text';
const file = {
path: 'C:\\Users\\username\\Projects\\projectname\\storybook\\node_modules\\@storybook\\addon-x+y\\dist\\manager.mjs',
contents: Uint8Array.from(Array.from(text).map((letter) => letter.charCodeAt(0))),
text,
};
const { location, url } = sanitizePath(file, addonsDir);
expect(location).toMatchInlineSnapshot(
`"C:\\\\Users\\\\username\\\\Projects\\\\projectname\\\\storybook\\\\node_modules\\\\@storybook\\\\addon-x+y\\\\dist\\\\manager.mjs"`
);
expect(url).toMatchInlineSnapshot(
`"./sb-addons/node_modules/%40storybook/addon-x%2By/dist/manager.mjs"`
);
});
}

6
code/lib/core-client/src/PreviewWeb.mockdata.ts
View File

@ -173,9 +173,9 @@ export const waitForEvents = (
events.forEach((event) => mockChannel.on(event, listener)); events.forEach((event) => mockChannel.on(event, listener));
// Don't wait too long // Don't wait too long
waitForQuiescence().then(() => waitForQuiescence().then(() => {
reject(new Error(`Event was not emitted in time: ${debugLabel || events}`)) reject(new Error(`Event was not emitted in time: ${debugLabel || events}`));
); });
}); });
}; };

2
code/lib/core-server/src/utils/server-statics.ts
View File

@ -73,7 +73,7 @@ export const parseStaticDir = async (arg: string) => {
const splitIndex = lastColonIndex !== -1 && !isWindowsRawDirOnly ? lastColonIndex : arg.length; const splitIndex = lastColonIndex !== -1 && !isWindowsRawDirOnly ? lastColonIndex : arg.length;
const targetRaw = arg.substring(splitIndex + 1) || '/'; const targetRaw = arg.substring(splitIndex + 1) || '/';
const target = targetRaw.split(path.win32.sep).join(path.posix.sep); // Ensure target has forward-slash path const target = targetRaw.split(path.sep).join(path.posix.sep); // Ensure target has forward-slash path
const rawDir = arg.substring(0, splitIndex); const rawDir = arg.substring(0, splitIndex);
const staticDir = path.isAbsolute(rawDir) ? rawDir : `./${rawDir}`; const staticDir = path.isAbsolute(rawDir) ? rawDir : `./${rawDir}`;