Skip to content

Commit baa0956

Browse files
authored
Revert "test: screenshot on failure (#3053)" (#3091)
It should be opt-in and configurable. The folder we collect information into should be consistent with the rest of the artifacts we collect. Lets revisit it later.
1 parent d8a17fb commit baa0956

File tree

2 files changed

+5
-28
lines changed

2 files changed

+5
-28
lines changed

test/jest/fixtures.js

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@ const { PlaywrightDispatcher } = require('../../lib/rpc/server/playwrightDispatc
2626
const { setUseApiName } = require('../../lib/progress');
2727

2828
const browserName = process.env.BROWSER || 'chromium';
29-
const activeBrowsers = new Set();
30-
global.__activeBrowsers__ = activeBrowsers;
3129

3230
module.exports = function registerFixtures(global) {
3331
global.registerWorkerFixture('parallelIndex', async ({}, test) => {
@@ -139,15 +137,13 @@ module.exports = function registerFixtures(global) {
139137

140138
global.registerWorkerFixture('browser', async ({browserType, defaultBrowserOptions}, test) => {
141139
const browser = await browserType.launch(defaultBrowserOptions);
142-
activeBrowsers.add(browser);
143140
try {
144141
await test(browser);
145142
if (browser.contexts().length !== 0) {
146143
console.warn(`\nWARNING: test did not close all created contexts! ${new Error().stack}\n`);
147144
await Promise.all(browser.contexts().map(context => context.close()));
148145
}
149146
} finally {
150-
activeBrowsers.delete(browser);
151147
await browser.close();
152148
}
153149
});

test/jest/playwrightEnvironment.js

Lines changed: 5 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -132,34 +132,15 @@ class PlaywrightEnvironment extends NodeEnvironment {
132132
if (event.name === 'test_start') {
133133
const fn = event.test.fn;
134134
event.test.fn = async () => {
135-
return await this.fixturePool.resolveParametersAndRun(fn);
135+
try {
136+
return await this.fixturePool.resolveParametersAndRun(fn);
137+
} finally {
138+
await this.fixturePool.teardownScope('test');
139+
}
136140
};
137141
}
138142

139-
if (event.name === 'test_fn_success')
140-
await this.fixturePool.teardownScope('test');
141-
142143
if (event.name === 'test_fn_failure') {
143-
let index = 0;
144-
for (const browser of global.__activeBrowsers__ || []) {
145-
for (const context of /** @type {import('../../').Browser} */ (browser).contexts()) {
146-
const pages = context.pages();
147-
const names = [];
148-
let current = event.test;
149-
while (current && current.name !== 'ROOT_DESCRIBE_BLOCK') {
150-
names.push(current.name)
151-
current = current.parent;
152-
}
153-
const fullName = names.reverse().join(' ')
154-
await Promise.all(pages.map(async (page) => {
155-
const filename = fullName.replace(/\s/g, '-') + '-' + index++ + '.png';
156-
await page.screenshot({
157-
path: path.join(this.global.testOptions.OUTPUT_DIR, filename)
158-
});
159-
}));
160-
}
161-
}
162-
await this.fixturePool.teardownScope('test');
163144
await this.fixturePool.teardownScope('worker');
164145
}
165146
}

0 commit comments

Comments
 (0)