From baa09569153e2944d6a45cac29792b00c6fe2bba Mon Sep 17 00:00:00 2001
From: Pavel Feldman <pavel.feldman@gmail.com>
Date: Wed, 22 Jul 2020 15:00:37 -0700
Subject: [PATCH] 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.
---
 test/jest/fixtures.js              |  4 ----
 test/jest/playwrightEnvironment.js | 29 +++++------------------------
 2 files changed, 5 insertions(+), 28 deletions(-)

diff --git a/test/jest/fixtures.js b/test/jest/fixtures.js
index 9f9a10c427..9233a2a753 100644
--- a/test/jest/fixtures.js
+++ b/test/jest/fixtures.js
@@ -26,8 +26,6 @@ const { PlaywrightDispatcher } = require('../../lib/rpc/server/playwrightDispatc
 const { setUseApiName } = require('../../lib/progress');
 
 const browserName = process.env.BROWSER || 'chromium';
-const activeBrowsers = new Set();
-global.__activeBrowsers__ = activeBrowsers;
 
 module.exports = function registerFixtures(global) {
   global.registerWorkerFixture('parallelIndex', async ({}, test) => {
@@ -139,7 +137,6 @@ module.exports = function registerFixtures(global) {
 
   global.registerWorkerFixture('browser', async ({browserType, defaultBrowserOptions}, test) => {
     const browser = await browserType.launch(defaultBrowserOptions);
-    activeBrowsers.add(browser);
     try {
       await test(browser);
       if (browser.contexts().length !== 0) {
@@ -147,7 +144,6 @@ module.exports = function registerFixtures(global) {
         await Promise.all(browser.contexts().map(context => context.close()));
       }
     } finally {
-      activeBrowsers.delete(browser);
       await browser.close();
     }
   });
diff --git a/test/jest/playwrightEnvironment.js b/test/jest/playwrightEnvironment.js
index 1bea2ee5ba..283bfcceb8 100644
--- a/test/jest/playwrightEnvironment.js
+++ b/test/jest/playwrightEnvironment.js
@@ -132,34 +132,15 @@ class PlaywrightEnvironment extends NodeEnvironment {
     if (event.name === 'test_start') {
       const fn = event.test.fn;
       event.test.fn = async () => {
-        return await this.fixturePool.resolveParametersAndRun(fn);
+        try {
+          return await this.fixturePool.resolveParametersAndRun(fn);
+        } finally {
+          await this.fixturePool.teardownScope('test');
+        }
       };
     }
 
-    if (event.name === 'test_fn_success')
-      await this.fixturePool.teardownScope('test');
-
     if (event.name === 'test_fn_failure') {
-      let index = 0;
-      for (const browser of global.__activeBrowsers__ || []) {
-        for (const context of /** @type {import('../../').Browser} */ (browser).contexts()) {
-          const pages = context.pages();
-          const names = [];
-          let current = event.test;
-          while (current && current.name !== 'ROOT_DESCRIBE_BLOCK') {
-            names.push(current.name)
-            current = current.parent;
-          }
-          const fullName = names.reverse().join(' ')
-          await Promise.all(pages.map(async (page) => {
-            const filename = fullName.replace(/\s/g, '-') + '-' + index++ + '.png';
-            await page.screenshot({
-              path: path.join(this.global.testOptions.OUTPUT_DIR, filename)
-            });
-          }));
-        }
-      }
-      await this.fixturePool.teardownScope('test');
       await this.fixturePool.teardownScope('worker');
     }
   }