Skip to content

Commit

Permalink
Resolve merge conflict for test file
Browse files Browse the repository at this point in the history
  • Loading branch information
ethriel3695 committed May 25, 2023
1 parent 62988db commit 065531a
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions bin-src/lib/getDependentStoryFiles.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -787,7 +787,7 @@ describe('getDependentStoryFiles', () => {
},
{
id: './src/foo.js',
name: './src/foo.js', // untraced
name: './src/foo.js',
reasons: [{ moduleName: './src/foo.stories.js' }],
},
{
Expand All @@ -803,7 +803,7 @@ describe('getDependentStoryFiles', () => {
];
const ctx = getContext({
configDir: 'path/to/storybook-config',
untraced: ['**/docs-decorator.jsx', '**/path/to/storybook-config/preview.js'],
untraced: ['**/decorator.jsx'],
});
const res = await getDependentStoryFiles(ctx, { modules }, statsPath, changedFiles);
expect(ctx.turboSnap.bailReason).toBeUndefined();
Expand Down

0 comments on commit 065531a

Please sign in to comment.