test: organize golden files under __snapshots__ folder (#3494)

.github/workflows/tests.yml

@@ -46,8 +46,8 @@ jobs:
     - uses: actions/upload-artifact@v1
       if: failure()
       with:
-        name: ${{ matrix.browser }}-${{ matrix.os }}-output
-        path: test/output-${{ matrix.browser }}
+        name: ${{ matrix.browser }}-${{ matrix.os }}-test-results
+        path: test-results
     - uses: actions/upload-artifact@v1
       if: ${{ always() }}
       with:
@@ -77,8 +77,8 @@ jobs:
     - uses: actions/upload-artifact@v1
       if: failure()
       with:
-        name: ${{ matrix.browser }}-mac-output
-        path: test/output-${{ matrix.browser }}
+        name: ${{ matrix.browser }}-mac-test-results
+        path: test-results
     - uses: actions/upload-artifact@v1
       if: ${{ always() }}
       with:
@@ -112,8 +112,8 @@ jobs:
     - uses: actions/upload-artifact@v1
       if: failure()
       with:
-        name: ${{ matrix.browser }}-win-output
-        path: test/output-${{ matrix.browser }}
+        name: ${{ matrix.browser }}-win-test-results
+        path: test-results
     - uses: actions/upload-artifact@v1
       if: ${{ always() }}
       with:
@@ -169,8 +169,8 @@ jobs:
     - uses: actions/upload-artifact@v1
       if: failure()
       with:
-        name: headful-${{ matrix.browser }}-linux-output
-        path: test/output-${{ matrix.browser }}
+        name: headful-${{ matrix.browser }}-linux-test-results
+        path: test-results
     - uses: actions/upload-artifact@v1
       if: ${{ always() }}
       with:
@@ -207,8 +207,8 @@ jobs:
     - uses: actions/upload-artifact@v1
       if: failure()
       with:
-        name: wire-${{ matrix.browser }}-linux-output
-        path: test/output-${{ matrix.browser }}
+        name: wire-${{ matrix.browser }}-linux-test-results
+        path: test-results
     - uses: actions/upload-artifact@v1
       if: ${{ always() }}
       with:

.gitignore

@@ -1,7 +1,6 @@
 /node_modules/
-/test/output-chromium
-/test/output-firefox
-/test/output-webkit
+/test-results/
+/test/coverage-report
 /test/test-user-data-dir*
 .local-browsers/
 /.dev_profile*

test/base.fixture.ts

@@ -26,6 +26,7 @@ import { setUnderTest } from '../lib/helper';
 import { installCoverageHooks } from './runner/coverage';
 import { valueFromEnv } from './runner/utils';
 import { registerFixture, registerWorkerFixture} from './runner/fixtures';
+import './runner/builtin.fixtures';
 
 import {mkdtempAsync, removeFolderAsync} from './utils';
 
@@ -37,13 +38,11 @@ const platform = os.platform();
 declare global {
   interface WorkerState {
     asset: (path: string) => string;
-    parallelIndex: number;
     defaultBrowserOptions: LaunchOptions;
     golden: (path: string) => string;
     playwright: typeof import('../index');
     browserType: BrowserType<Browser>;
     browser: Browser;
-    tmpDir: string;
   }
   interface FixtureState {
     toImpl: (rpcObject: any) => any;
@@ -62,10 +61,6 @@ declare global {
 (global as any).FFOX = browserName === 'firefox';
 (global as any).WEBKIT = browserName === 'webkit';
 
-registerWorkerFixture('parallelIndex', async ({}, test) => {
-  await test(parseInt(process.env.JEST_WORKER_ID, 10) - 1);
-});
-
 registerWorkerFixture('httpService', async ({parallelIndex}, test) => {
   const assetsPath = path.join(__dirname, 'assets');
   const cachedPath = path.join(__dirname, 'assets', 'cached');
@@ -139,7 +134,7 @@ registerWorkerFixture('playwright', async({parallelIndex}, test) => {
 
   async function teardownCoverage() {
     uninstall();
-    const coveragePath = path.join(path.join(__dirname, 'output-' + browserName), 'coverage', parallelIndex + '.json');
+    const coveragePath = path.join(path.join(__dirname, 'coverage-report'), 'coverage', parallelIndex + '.json');
     const coverageJSON = [...coverage.keys()].filter(key => coverage.get(key));
     await fs.promises.mkdir(path.dirname(coveragePath), { recursive: true });
     await fs.promises.writeFile(coveragePath, JSON.stringify(coverageJSON, undefined, 2), 'utf8');
@@ -205,5 +200,5 @@ registerWorkerFixture('asset', async ({}, test) => {
 });
 
 registerWorkerFixture('golden', async ({browserName}, test) => {
-  await test(p => path.join(__dirname, `golden-${browserName}`, p));
+  await test(p => path.join(`${browserName}`, p));
 });

test/chromium/oopif.spec.ts

@@ -155,7 +155,7 @@ it.skip(!CHROMIUM)('should take screenshot', async({browser, page, server, golde
   await page.goto(server.PREFIX + '/dynamic-oopif.html');
   expect(page.frames().length).toBe(2);
   expect(await countOOPIFs(browser)).toBe(1);
-  expect(await page.screenshot()).toMatchImage(golden('screenshot-oopif.png'));
+  expect(await page.screenshot()).toMatchImage(golden('screenshot-oopif.png'), { threshold: 0.3 });
 });
 
 it.skip(!CHROMIUM)('should load oopif iframes with subresources and request interception', async function({browser, page, server, context}) {

test/chromium/tracing.spec.ts

@@ -13,6 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
+import '../runner/builtin.fixtures';
 import '../base.fixture';
 import { registerFixture } from '../runner/fixtures';
 

test/defaultbrowsercontext.spec.ts

@@ -14,6 +14,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
+import './runner/builtin.fixtures';
 import './base.fixture';
 import { registerFixture } from './runner/fixtures';
 import fs from 'fs';

test/download.spec.ts

@@ -13,6 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
+import './runner/builtin.fixtures';
 import './base.fixture';
 
 import fs from 'fs';

test/downloads-path.spec.ts

@@ -13,7 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
+
+import './runner/builtin.fixtures';
 import './base.fixture';
+
 import { registerFixture } from './runner/fixtures';
 
 import path from 'path';

test/golden-chromium/csscoverage-involved.txt

@@ -1,16 +0,0 @@
-[
-  {
-    "url": "http://localhost:<PORT>/csscoverage/involved.html",
-    "ranges": [
-      {
-        "start": 149,
-        "end": 297
-      },
-      {
-        "start": 327,
-        "end": 433
-      }
-    ],
-    "text": "\n@charset \"utf-8\";\n@namespace svg url(http://www.w3.org/2000/svg);\n@font-face {\n  font-family: \"Example Font\";\n  src: url(\"./Dosis-Regular.ttf\");\n}\n\n#fluffy {\n  border: 1px solid black;\n  z-index: 1;\n  /* -webkit-disabled-property: rgb(1, 2, 3) */\n  -lol-cats: \"dogs\" /* non-existing property */\n}\n\n@media (min-width: 1px) {\n  span {\n    -webkit-border-radius: 10px;\n    font-family: \"Example Font\";\n    animation: 1s identifier;\n  }\n}\n"
-  }
-]

test/golden-chromium/jscoverage-involved.txt

@@ -1,28 +0,0 @@
-[
-  {
-    "url": "http://localhost:<PORT>/jscoverage/involved.html",
-    "ranges": [
-      {
-        "start": 0,
-        "end": 35
-      },
-      {
-        "start": 50,
-        "end": 100
-      },
-      {
-        "start": 107,
-        "end": 141
-      },
-      {
-        "start": 148,
-        "end": 160
-      },
-      {
-        "start": 168,
-        "end": 207
-      }
-    ],
-    "text": "\nfunction foo() {\n  if (1 > 2)\n    console.log(1);\n  if (1 < 2)\n    console.log(2);\n  let x = 1 > 2 ? 'foo' : 'bar';\n  let y = 1 < 2 ? 'foo' : 'bar';\n  let z = () => {};\n  let q = () => {};\n  q();\n}\n\nfoo();\n"
-  }
-]