Skip to content

Commit 9830af5

Browse files
yannbfyannbf
committed
fix sync issues between tests
1 parent 3e6681c commit 9830af5

File tree

8 files changed

+68
-181
lines changed

8 files changed

+68
-181
lines changed

‎playwright/jest-setup.js

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,4 @@
1-
const {
2-
getTestRunnerConfig,
3-
setPreVisit,
4-
setPostVisit,
5-
setupPage,
6-
throwUncaughtPageError,
7-
} = require('../dist');
1+
const { getTestRunnerConfig, setPreVisit, setPostVisit, setupPage } = require('../dist');
82

93
const testRunnerConfig = getTestRunnerConfig(process.env.STORYBOOK_CONFIG_DIR);
104
if (testRunnerConfig) {
@@ -27,5 +21,4 @@ if (testRunnerConfig) {
2721
// If the transformed tests need a dependency, it has to be globally available
2822
// in order to work both in default (file transformation) and stories/index.json mode.
2923
globalThis.__sbSetupPage = setupPage;
30-
globalThis.__sbThrowUncaughtPageError = throwUncaughtPageError;
3124
globalThis.__sbCollectCoverage = process.env.STORYBOOK_COLLECT_COVERAGE === 'true';

‎src/csf/__snapshots__/transformCsf.test.ts.snap

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,6 @@ if (!require.main) {
2626
title: "Button",
2727
name: "Primary"
2828
};
29-
const onPageError = err => {
30-
globalThis.__sbThrowUncaughtPageError(err, context);
31-
};
32-
page.on('pageerror', onPageError);
3329
if (globalThis.__sbPreVisit) {
3430
await globalThis.__sbPreVisit(page, context);
3531
}
@@ -51,7 +47,6 @@ if (!require.main) {
5147
}
5248
await jestPlaywright.saveCoverage(page);
5349
}
54-
page.off('pageerror', onPageError);
5550
return result;
5651
};
5752
try {
@@ -98,10 +93,6 @@ if (!require.main) {
9893
title: "Button",
9994
name: "Primary"
10095
};
101-
const onPageError = err => {
102-
globalThis.__sbThrowUncaughtPageError(err, context);
103-
};
104-
page.on('pageerror', onPageError);
10596
if (globalThis.__sbPreVisit) {
10697
await globalThis.__sbPreVisit(page, context);
10798
}
@@ -123,7 +114,6 @@ if (!require.main) {
123114
}
124115
await jestPlaywright.saveCoverage(page);
125116
}
126-
page.off('pageerror', onPageError);
127117
return result;
128118
};
129119
try {
@@ -156,10 +146,6 @@ if (!require.main) {
156146
title: "Button",
157147
name: "Primary"
158148
};
159-
const onPageError = err => {
160-
globalThis.__sbThrowUncaughtPageError(err, context);
161-
};
162-
page.on('pageerror', onPageError);
163149
if (globalThis.__sbPreVisit) {
164150
await globalThis.__sbPreVisit(page, context);
165151
}
@@ -181,7 +167,6 @@ if (!require.main) {
181167
}
182168
await jestPlaywright.saveCoverage(page);
183169
}
184-
page.off('pageerror', onPageError);
185170
return result;
186171
};
187172
try {

‎src/playwright/hooks.ts

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -81,18 +81,3 @@ export const waitForPageReady = async (page: Page) => {
8181
await page.waitForLoadState('networkidle');
8282
await page.evaluate(() => document.fonts.ready);
8383
};
84-
85-
export const throwUncaughtPageError = (err: Error, context: TestContext) => {
86-
const storybookUrl = process.env.REFERENCE_URL || process.env.TARGET_URL;
87-
const storyUrl = `${storybookUrl}?path=/story/${context.id}`;
88-
89-
const errorMessage = dedent`
90-
An uncaught error occurred when visiting the following story.
91-
Please access the link and check the logs in the browser:
92-
${storyUrl}
93-
94-
Message:
95-
${err.stack || err.message}\n`;
96-
97-
throw new Error(errorMessage);
98-
};

‎src/playwright/transformPlaywright.test.ts

Lines changed: 0 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,6 @@ describe('Playwright', () => {
6666
title: "Example/foo/bar",
6767
name: "A"
6868
};
69-
const onPageError = err => {
70-
globalThis.__sbThrowUncaughtPageError(err, context);
71-
};
72-
page.on('pageerror', onPageError);
7369
if (globalThis.__sbPreVisit) {
7470
await globalThis.__sbPreVisit(page, context);
7571
}
@@ -91,7 +87,6 @@ describe('Playwright', () => {
9187
}
9288
await jestPlaywright.saveCoverage(page);
9389
}
94-
page.off('pageerror', onPageError);
9590
return result;
9691
};
9792
try {
@@ -116,10 +111,6 @@ describe('Playwright', () => {
116111
title: "Example/foo/bar",
117112
name: "B"
118113
};
119-
const onPageError = err => {
120-
globalThis.__sbThrowUncaughtPageError(err, context);
121-
};
122-
page.on('pageerror', onPageError);
123114
if (globalThis.__sbPreVisit) {
124115
await globalThis.__sbPreVisit(page, context);
125116
}
@@ -141,7 +132,6 @@ describe('Playwright', () => {
141132
}
142133
await jestPlaywright.saveCoverage(page);
143134
}
144-
page.off('pageerror', onPageError);
145135
return result;
146136
};
147137
try {
@@ -184,10 +174,6 @@ describe('Playwright', () => {
184174
title: "Example/foo/bar",
185175
name: "B"
186176
};
187-
const onPageError = err => {
188-
globalThis.__sbThrowUncaughtPageError(err, context);
189-
};
190-
page.on('pageerror', onPageError);
191177
if (globalThis.__sbPreVisit) {
192178
await globalThis.__sbPreVisit(page, context);
193179
}
@@ -209,7 +195,6 @@ describe('Playwright', () => {
209195
}
210196
await jestPlaywright.saveCoverage(page);
211197
}
212-
page.off('pageerror', onPageError);
213198
return result;
214199
};
215200
try {
@@ -252,10 +237,6 @@ describe('Playwright', () => {
252237
title: "Example/foo/bar",
253238
name: "A"
254239
};
255-
const onPageError = err => {
256-
globalThis.__sbThrowUncaughtPageError(err, context);
257-
};
258-
page.on('pageerror', onPageError);
259240
if (globalThis.__sbPreVisit) {
260241
await globalThis.__sbPreVisit(page, context);
261242
}
@@ -277,7 +258,6 @@ describe('Playwright', () => {
277258
}
278259
await jestPlaywright.saveCoverage(page);
279260
}
280-
page.off('pageerror', onPageError);
281261
return result;
282262
};
283263
try {
@@ -302,10 +282,6 @@ describe('Playwright', () => {
302282
title: "Example/foo/bar",
303283
name: "B"
304284
};
305-
const onPageError = err => {
306-
globalThis.__sbThrowUncaughtPageError(err, context);
307-
};
308-
page.on('pageerror', onPageError);
309285
if (globalThis.__sbPreVisit) {
310286
await globalThis.__sbPreVisit(page, context);
311287
}
@@ -327,7 +303,6 @@ describe('Playwright', () => {
327303
}
328304
await jestPlaywright.saveCoverage(page);
329305
}
330-
page.off('pageerror', onPageError);
331306
return result;
332307
};
333308
try {
@@ -379,10 +354,6 @@ describe('Playwright', () => {
379354
title: "Example/foo/bar",
380355
name: "B"
381356
};
382-
const onPageError = err => {
383-
globalThis.__sbThrowUncaughtPageError(err, context);
384-
};
385-
page.on('pageerror', onPageError);
386357
if (globalThis.__sbPreVisit) {
387358
await globalThis.__sbPreVisit(page, context);
388359
}
@@ -404,7 +375,6 @@ describe('Playwright', () => {
404375
}
405376
await jestPlaywright.saveCoverage(page);
406377
}
407-
page.off('pageerror', onPageError);
408378
return result;
409379
};
410380
try {
@@ -429,10 +399,6 @@ describe('Playwright', () => {
429399
title: "Example/foo/bar",
430400
name: "C"
431401
};
432-
const onPageError = err => {
433-
globalThis.__sbThrowUncaughtPageError(err, context);
434-
};
435-
page.on('pageerror', onPageError);
436402
if (globalThis.__sbPreVisit) {
437403
await globalThis.__sbPreVisit(page, context);
438404
}
@@ -454,7 +420,6 @@ describe('Playwright', () => {
454420
}
455421
await jestPlaywright.saveCoverage(page);
456422
}
457-
page.off('pageerror', onPageError);
458423
return result;
459424
};
460425
try {
@@ -511,10 +476,6 @@ describe('Playwright', () => {
511476
title: "Example/foo/bar",
512477
name: "A"
513478
};
514-
const onPageError = err => {
515-
globalThis.__sbThrowUncaughtPageError(err, context);
516-
};
517-
page.on('pageerror', onPageError);
518479
if (globalThis.__sbPreVisit) {
519480
await globalThis.__sbPreVisit(page, context);
520481
}
@@ -536,7 +497,6 @@ describe('Playwright', () => {
536497
}
537498
await jestPlaywright.saveCoverage(page);
538499
}
539-
page.off('pageerror', onPageError);
540500
return result;
541501
};
542502
try {
@@ -577,10 +537,6 @@ describe('Playwright', () => {
577537
title: "Example/foo/bar",
578538
name: "A"
579539
};
580-
const onPageError = err => {
581-
globalThis.__sbThrowUncaughtPageError(err, context);
582-
};
583-
page.on('pageerror', onPageError);
584540
if (globalThis.__sbPreVisit) {
585541
await globalThis.__sbPreVisit(page, context);
586542
}
@@ -602,7 +558,6 @@ describe('Playwright', () => {
602558
}
603559
await jestPlaywright.saveCoverage(page);
604560
}
605-
page.off('pageerror', onPageError);
606561
return result;
607562
};
608563
try {
@@ -643,10 +598,6 @@ describe('Playwright', () => {
643598
title: "Example/Header",
644599
name: "A"
645600
};
646-
const onPageError = err => {
647-
globalThis.__sbThrowUncaughtPageError(err, context);
648-
};
649-
page.on('pageerror', onPageError);
650601
if (globalThis.__sbPreVisit) {
651602
await globalThis.__sbPreVisit(page, context);
652603
}
@@ -668,7 +619,6 @@ describe('Playwright', () => {
668619
}
669620
await jestPlaywright.saveCoverage(page);
670621
}
671-
page.off('pageerror', onPageError);
672622
return result;
673623
};
674624
try {

‎src/playwright/transformPlaywright.ts

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,6 @@ export const testPrefixer: TestPrefixer = (context) => {
2020
async () => {
2121
const testFn = async() => {
2222
const context = { id: %%id%%, title: %%title%%, name: %%name%% };
23-
24-
const onPageError = (err) => {
25-
globalThis.__sbThrowUncaughtPageError(err, context);
26-
}
27-
28-
page.on('pageerror', onPageError);
2923
3024
if(globalThis.__sbPreVisit) {
3125
await globalThis.__sbPreVisit(page, context);
@@ -48,7 +42,6 @@ export const testPrefixer: TestPrefixer = (context) => {
4842
await jestPlaywright.saveCoverage(page);
4943
}
5044
51-
page.off('pageerror', onPageError);
5245
5346
return result;
5447
};

0 commit comments

Comments
 (0)