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

Merge pull request #4689 from storybooks/addon-jest/fix-tests-matching

Browse Source 
Addons Jest - Fix test matching
This commit is contained in:
Igor 2018-11-05 18:46:22 +02:00 committed by GitHub
commit 2a553acc7c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
addons/jest/src/index.js
View File

@ -5,13 +5,19 @@ import { normalize } from 'upath';
const findTestResults = (testFiles, jestTestResults, jestTestFilesExt) =>
Object.values(testFiles).map(name => {
const fileName = `${name}${jestTestFilesExt}`;
if (jestTestResults && jestTestResults.testResults) {
const fileNamePattern = new RegExp(fileName);
return {
fileName,
name,
result: jestTestResults.testResults.find(t => normalize(t.name).includes(fileName)),
result: jestTestResults.testResults.find(test =>
normalize(test.name).match(fileNamePattern)
),
};
}
return { fileName, name };
});
@ -38,13 +44,12 @@ export const withTests = userOptions => {
}, 'Passing component filenames to the `@storybook/addon-jest` via `withTests` is deprecated. Instead, use the `jest` story parameter');
}
const [
story,
{
kind,
parameters: { jest: testFiles },
},
] = args;
const [story, { kind, parameters = {} }] = args;
let { jest: testFiles } = parameters;
if (typeof testFiles === 'string') {
testFiles = [testFiles];
}
if (testFiles && !testFiles.disable) {
emitAddTests({ kind, story, testFiles, options });