diff --git a/.github/workflows/tests_secondary.yml b/.github/workflows/tests_secondary.yml index c677a73b5b..edff53b13b 100644 --- a/.github/workflows/tests_secondary.yml +++ b/.github/workflows/tests_secondary.yml @@ -148,8 +148,10 @@ jobs: - run: node lib/cli/cli install-deps ${{ matrix.browser }} chromium # XVFB-RUN merges both STDOUT and STDERR, whereas we need only STDERR # Wrap `npm run` in a subshell to redirect STDERR to file. - - run: xvfb-run --auto-servernum --server-args="-screen 0 1280x960x24" -- bash -c "npm run test -- --project=${{ matrix.browser }} --headed" + - run: xvfb-run --auto-servernum --server-args="-screen 0 1280x960x24" -- bash -c "npm run test -- --project=${{ matrix.browser }}" if: ${{ always() }} + env: + HEADFUL: 1 - run: ./utils/upload_flakiness_dashboard.sh ./test-results/report.json if: always() - uses: actions/upload-artifact@v1 @@ -177,7 +179,9 @@ jobs: - run: node lib/cli/cli install-deps chromium # XVFB-RUN merges both STDOUT and STDERR, whereas we need only STDERR # Wrap `npm run` in a subshell to redirect STDERR to file. - - run: xvfb-run --auto-servernum --server-args="-screen 0 1280x960x24" -- bash -c "npm run ctest -- --mode=${{ matrix.mode }}" + - run: xvfb-run --auto-servernum --server-args="-screen 0 1280x960x24" -- bash -c "npm run ctest" + env: + PWTEST_MODE: ${{ matrix.mode }} - run: ./utils/upload_flakiness_dashboard.sh ./test-results/report.json if: always() - uses: actions/upload-artifact@v1 @@ -205,7 +209,9 @@ jobs: - run: node lib/cli/cli install-deps ${{ matrix.browser }} chromium # XVFB-RUN merges both STDOUT and STDERR, whereas we need only STDERR # Wrap `npm run` in a subshell to redirect STDERR to file. - - run: xvfb-run --auto-servernum --server-args="-screen 0 1280x960x24" -- bash -c "npm run test -- --project=${{ matrix.browser }} --video" + - run: xvfb-run --auto-servernum --server-args="-screen 0 1280x960x24" -- bash -c "npm run test -- --project=${{ matrix.browser }}" + env: + PWTEST_VIDEO: 1 - run: ./utils/upload_flakiness_dashboard.sh ./test-results/report.json if: always() - uses: actions/upload-artifact@v1 @@ -264,7 +270,9 @@ jobs: - run: node lib/cli/cli install ffmpeg # XVFB-RUN merges both STDOUT and STDERR, whereas we need only STDERR # Wrap `npm run` in a subshell to redirect STDERR to file. - - run: xvfb-run --auto-servernum --server-args="-screen 0 1280x960x24" -- bash -c "npm run ctest -- --channel=chrome" + - run: xvfb-run --auto-servernum --server-args="-screen 0 1280x960x24" -- bash -c "npm run ctest" + env: + PWTEST_CHANNEL: chrome - run: ./utils/upload_flakiness_dashboard.sh ./test-results/report.json if: always() - uses: actions/upload-artifact@v1 @@ -290,8 +298,10 @@ jobs: - run: npm run build # This only created problems, should we move ffmpeg back into npm? - run: node lib/cli/cli install ffmpeg - - run: npm run ctest -- --channel=chrome + - run: npm run ctest shell: bash + env: + PWTEST_CHANNEL: chrome - run: ./utils/upload_flakiness_dashboard.sh ./test-results/report.json if: always() shell: bash @@ -315,7 +325,9 @@ jobs: - run: npm run build # This only created problems, should we move ffmpeg back into npm? - run: node lib/cli/cli install ffmpeg - - run: npm run ctest -- --channel=chrome + - run: npm run ctest + env: + PWTEST_CHANNEL: chrome - run: ./utils/upload_flakiness_dashboard.sh ./test-results/report.json if: always() - uses: actions/upload-artifact@v1 @@ -340,7 +352,9 @@ jobs: - run: node lib/cli/cli install ffmpeg firefox-stable chromium # XVFB-RUN merges both STDOUT and STDERR, whereas we need only STDERR # Wrap `npm run` in a subshell to redirect STDERR to file. - - run: xvfb-run --auto-servernum --server-args="-screen 0 1280x960x24" -- bash -c "npm run ftest -- --channel=firefox-stable" + - run: xvfb-run --auto-servernum --server-args="-screen 0 1280x960x24" -- bash -c "npm run ftest" + env: + PWTEST_CHANNEL: firefox-stable - run: ./utils/upload_flakiness_dashboard.sh ./test-results/report.json if: always() - uses: actions/upload-artifact@v1 @@ -365,8 +379,10 @@ jobs: PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1 - run: npm run build - run: node lib/cli/cli install ffmpeg firefox-stable chromium - - run: npm run ftest -- --channel=firefox-stable + - run: npm run ftest shell: bash + env: + PWTEST_CHANNEL: firefox-stable - run: ./utils/upload_flakiness_dashboard.sh ./test-results/report.json if: always() shell: bash @@ -389,7 +405,9 @@ jobs: PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1 - run: npm run build - run: node lib/cli/cli install ffmpeg firefox-stable chromium - - run: npm run ftest -- --channel=firefox-stable + - run: npm run ftest + env: + PWTEST_CHANNEL: firefox-stable - run: ./utils/upload_flakiness_dashboard.sh ./test-results/report.json if: always() - uses: actions/upload-artifact@v1 @@ -415,8 +433,10 @@ jobs: - run: npm run build # This only created problems, should we move ffmpeg back into npm? - run: node lib/cli/cli install ffmpeg - - run: npm run ctest -- --channel=msedge + - run: npm run ctest shell: bash + env: + PWTEST_CHANNEL: msedge - uses: actions/upload-artifact@v1 if: ${{ always() }} with: @@ -463,7 +483,9 @@ jobs: - run: node lib/cli/cli install ffmpeg # XVFB-RUN merges both STDOUT and STDERR, whereas we need only STDERR # Wrap `npm run` in a subshell to redirect STDERR to file. - - run: xvfb-run --auto-servernum --server-args="-screen 0 1280x960x24" -- bash -c "npm run ctest -- --channel=chrome-beta" + - run: xvfb-run --auto-servernum --server-args="-screen 0 1280x960x24" -- bash -c "npm run ctest" + env: + PWTEST_CHANNEL: chrome-beta - run: ./utils/upload_flakiness_dashboard.sh ./test-results/report.json if: always() - uses: actions/upload-artifact@v1 @@ -490,8 +512,10 @@ jobs: PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1 - run: npm run build - run: node lib/cli/cli install ffmpeg - - run: npm run ctest -- --channel=chrome-beta + - run: npm run ctest shell: bash + env: + PWTEST_CHANNEL: chrome-beta - run: ./utils/upload_flakiness_dashboard.sh ./test-results/report.json if: always() shell: bash @@ -515,7 +539,9 @@ jobs: PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1 - run: npm run build - run: node lib/cli/cli install ffmpeg - - run: npm run ctest -- --channel=chrome-beta + - run: npm run ctest + env: + PWTEST_CHANNEL: chrome-beta - run: ./utils/upload_flakiness_dashboard.sh ./test-results/report.json if: always() - uses: actions/upload-artifact@v1 diff --git a/package-lock.json b/package-lock.json index 954bb589f4..a0a3246ff9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14,9 +14,9 @@ } }, "@babel/compat-data": { - "version": "7.14.0", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.14.0.tgz", - "integrity": "sha512-vu9V3uMM/1o5Hl5OekMUowo3FqXLJSw+s+66nt0fSWVWTtmosdzn45JHOB3cPtZoe6CTBDzvSw0RdOY85Q37+Q==", + "version": "7.14.4", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.14.4.tgz", + "integrity": "sha512-i2wXrWQNkH6JplJQGn3Rd2I4Pij8GdHkXwHMxm+zV5YG/Jci+bCNrWZEWC4o+umiDkRrRs4dVzH3X4GP7vyjQQ==", "dev": true }, "@babel/core": { @@ -94,14 +94,14 @@ } }, "@babel/helper-compilation-targets": { - "version": "7.13.16", - "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.13.16.tgz", - "integrity": "sha512-3gmkYIrpqsLlieFwjkGgLaSHmhnvlAYzZLlYVjlW+QwI+1zE17kGxuJGmIqDQdYp56XdmGeD+Bswx0UTyG18xA==", + "version": "7.14.4", + "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.14.4.tgz", + "integrity": "sha512-JgdzOYZ/qGaKTVkn5qEDV/SXAh8KcyUVkCoSWGN8T3bwrgd6m+/dJa2kVGi6RJYJgEYPBdZ84BZp9dUjNWkBaA==", "dev": true, "requires": { - "@babel/compat-data": "^7.13.15", + "@babel/compat-data": "^7.14.4", "@babel/helper-validator-option": "^7.12.17", - "browserslist": "^4.14.5", + "browserslist": "^4.16.6", "semver": "^6.3.0" }, "dependencies": { @@ -114,16 +114,16 @@ } }, "@babel/helper-create-class-features-plugin": { - "version": "7.14.3", - "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.14.3.tgz", - "integrity": "sha512-BnEfi5+6J2Lte9LeiL6TxLWdIlEv9Woacc1qXzXBgbikcOzMRM2Oya5XGg/f/ngotv1ej2A/b+3iJH8wbS1+lQ==", + "version": "7.14.4", + "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.14.4.tgz", + "integrity": "sha512-idr3pthFlDCpV+p/rMgGLGYIVtazeatrSOQk8YzO2pAepIjQhCN3myeihVg58ax2bbbGK9PUE1reFi7axOYIOw==", "dev": true, "requires": { "@babel/helper-annotate-as-pure": "^7.12.13", "@babel/helper-function-name": "^7.14.2", "@babel/helper-member-expression-to-functions": "^7.13.12", "@babel/helper-optimise-call-expression": "^7.12.13", - "@babel/helper-replace-supers": "^7.14.3", + "@babel/helper-replace-supers": "^7.14.4", "@babel/helper-split-export-declaration": "^7.12.13" } }, @@ -197,15 +197,15 @@ "dev": true }, "@babel/helper-replace-supers": { - "version": "7.14.3", - "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.14.3.tgz", - "integrity": "sha512-Rlh8qEWZSTfdz+tgNV/N4gz1a0TMNwCUcENhMjHTHKp3LseYH5Jha0NSlyTQWMnjbYcwFt+bqAMqSLHVXkQ6UA==", + "version": "7.14.4", + "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.14.4.tgz", + "integrity": "sha512-zZ7uHCWlxfEAAOVDYQpEf/uyi1dmeC7fX4nCf2iz9drnCwi1zvwXL3HwWWNXUQEJ1k23yVn3VbddiI9iJEXaTQ==", "dev": true, "requires": { "@babel/helper-member-expression-to-functions": "^7.13.12", "@babel/helper-optimise-call-expression": "^7.12.13", "@babel/traverse": "^7.14.2", - "@babel/types": "^7.14.2" + "@babel/types": "^7.14.4" } }, "@babel/helper-simple-access": { @@ -270,9 +270,9 @@ } }, "@babel/parser": { - "version": "7.14.3", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.14.3.tgz", - "integrity": "sha512-7MpZDIfI7sUC5zWo2+foJ50CSI5lcqDehZ0lVgIhSi4bFEk94fLAKlF3Q0nzSQQ+ca0lm+O6G9ztKVBeu8PMRQ==", + "version": "7.14.4", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.14.4.tgz", + "integrity": "sha512-ArliyUsWDUqEGfWcmzpGUzNfLxTdTp6WU4IuP6QFSp9gGfWS6boxFCkJSJ/L4+RG8z/FnIU3WxCk6hPL9SSWeA==", "dev": true }, "@babel/plugin-proposal-class-properties": { @@ -489,12 +489,12 @@ } }, "@babel/plugin-transform-typescript": { - "version": "7.14.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.14.3.tgz", - "integrity": "sha512-G5Bb5pY6tJRTC4ag1visSgiDoGgJ1u1fMUgmc2ijLkcIdzP83Q1qyZX4ggFQ/SkR+PNOatkaYC+nKcTlpsX4ag==", + "version": "7.14.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.14.4.tgz", + "integrity": "sha512-WYdcGNEO7mCCZ2XzRlxwGj3PgeAr50ifkofOUC/+IN/GzKLB+biDPVBUAQN2C/dVZTvEXCp80kfQ1FFZPrwykQ==", "dev": true, "requires": { - "@babel/helper-create-class-features-plugin": "^7.14.3", + "@babel/helper-create-class-features-plugin": "^7.14.4", "@babel/helper-plugin-utils": "^7.13.0", "@babel/plugin-syntax-typescript": "^7.12.13" } @@ -566,9 +566,9 @@ } }, "@babel/types": { - "version": "7.14.2", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.14.2.tgz", - "integrity": "sha512-SdjAG/3DikRHpUOjxZgnkbR11xUlyDMUFJdvnIgZEE16mqmY0BINMmc4//JMJglEmn6i7sq6p+mGrFWyZ98EEw==", + "version": "7.14.4", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.14.4.tgz", + "integrity": "sha512-lCj4aIs0xUefJFQnwwQv2Bxg7Omd6bgquZ6LGC+gGMh6/s5qDVfjuCMlDmYQ15SLsWHd9n+X3E75lKIhl5Lkiw==", "dev": true, "requires": { "@babel/helper-validator-identifier": "^7.14.0", @@ -2777,9 +2777,9 @@ } }, "electron-to-chromium": { - "version": "1.3.740", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.740.tgz", - "integrity": "sha512-Mi2m55JrX2BFbNZGKYR+2ItcGnR4O5HhrvgoRRyZQlaMGQULqDhoGkLWHzJoshSzi7k1PUofxcDbNhlFrDZNhg==", + "version": "1.3.741", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.741.tgz", + "integrity": "sha512-4i3T0cwnHo1O4Mnp9JniEco8bZiXoqbm3PhW5hv7uu8YLg35iajYrRnNyKFaN8/8SSTskU2hYqVTeYVPceSpUA==", "dev": true }, "elliptic": { @@ -3624,9 +3624,9 @@ } }, "folio": { - "version": "0.4.0-alpha19", - "resolved": "https://registry.npmjs.org/folio/-/folio-0.4.0-alpha19.tgz", - "integrity": "sha512-gWNfyQTF41nOHiH2BwsqXBRYhr/oDRxC1cQN2VTnVH+KQEbyic1wIMQuvK2a8Nm4j0Mokyg20H3cSMdg6wzXhQ==", + "version": "0.4.0-alpha21", + "resolved": "https://registry.npmjs.org/folio/-/folio-0.4.0-alpha21.tgz", + "integrity": "sha512-0xfSvwZStmE4nbSkeryBPRM5qen/58U/h+ca9SncPjFHFACtE7zpiCXgRlDb6UvdUD1x5fPnkfa2UKwzmwjMcA==", "dev": true, "requires": { "@babel/code-frame": "^7.12.13", diff --git a/package.json b/package.json index 1fb2703b5e..70a4ffe927 100644 --- a/package.json +++ b/package.json @@ -80,7 +80,7 @@ "eslint-plugin-notice": "^0.9.10", "eslint-plugin-react-hooks": "^4.2.0", "file-loader": "^6.1.0", - "folio": "=0.4.0-alpha19", + "folio": "=0.4.0-alpha21", "formidable": "^1.2.2", "html-webpack-plugin": "^4.4.1", "ncp": "^2.0.0", diff --git a/tests/__snapshots__/chromium/oopif/should-take-screenshot/chromium/screenshot-oopif.png b/tests/chromium/oopif.spec.ts-snapshots/should-take-screenshot-chromium-screenshot-oopif.png similarity index 100% rename from tests/__snapshots__/chromium/oopif/should-take-screenshot/chromium/screenshot-oopif.png rename to tests/chromium/oopif.spec.ts-snapshots/should-take-screenshot-chromium-screenshot-oopif.png diff --git a/tests/config/android.config.ts b/tests/config/android.config.ts index 2c05549589..4375dc24c8 100644 --- a/tests/config/android.config.ts +++ b/tests/config/android.config.ts @@ -25,7 +25,6 @@ const outputDir = path.join(__dirname, '..', '..', 'test-results'); const testDir = path.join(__dirname, '..'); const config: folio.Config = { testDir, - snapshotDir: '__snapshots__', outputDir, timeout: 120000, globalTimeout: 7200000, diff --git a/tests/config/baseTest.ts b/tests/config/baseTest.ts index 997fa106f1..245c823ef4 100644 --- a/tests/config/baseTest.ts +++ b/tests/config/baseTest.ts @@ -124,7 +124,7 @@ const baseFixtures: folio.Fixtures<{ __baseSetup: void }, BaseOptions & BaseFixt isMac: [ process.platform === 'darwin', { scope: 'worker' } ], isLinux: [ process.platform === 'linux', { scope: 'worker' } ], __baseSetup: [ async ({ browserName }, run, testInfo) => { - testInfo.snapshotPathSegment = browserName; + testInfo.snapshotSuffix = browserName; await run(); }, { auto: true } ], }; diff --git a/tests/config/default.config.ts b/tests/config/default.config.ts index f9ebc1eba1..d711068dff 100644 --- a/tests/config/default.config.ts +++ b/tests/config/default.config.ts @@ -38,16 +38,15 @@ const pageFixtures = { isElectron: false, }; -const mode = (folio.registerCLIOption('mode', 'Transport mode: default, driver or service').value || 'default') as ('default' | 'driver' | 'service'); -const headed = folio.registerCLIOption('headed', 'Run tests in headed mode (default: headless)', { type: 'boolean' }).value || !!process.env.HEADFUL; -const channel = folio.registerCLIOption('channel', 'Browser channel (default: no channel)').value as any; -const video = !!folio.registerCLIOption('video', 'Record videos for all tests', { type: 'boolean' }).value; +const mode = (process.env.PWTEST_MODE || 'default') as ('default' | 'driver' | 'service'); +const headed = !!process.env.HEADFUL; +const channel = process.env.PWTEST_CHANNEL as any; +const video = !!process.env.PWTEST_VIDEO; const outputDir = path.join(__dirname, '..', '..', 'test-results'); const testDir = path.join(__dirname, '..'); const config: folio.Config = { testDir, - snapshotDir: '__snapshots__', outputDir, timeout: video || process.env.PWTRACE ? 60000 : 30000, globalTimeout: 5400000, diff --git a/tests/config/electron.config.ts b/tests/config/electron.config.ts index b8df2d16fd..2ae639f69e 100644 --- a/tests/config/electron.config.ts +++ b/tests/config/electron.config.ts @@ -25,7 +25,6 @@ const outputDir = path.join(__dirname, '..', '..', 'test-results'); const testDir = path.join(__dirname, '..'); const config: folio.Config = { testDir, - snapshotDir: '__snapshots__', outputDir, timeout: 30000, globalTimeout: 5400000, diff --git a/tests/__snapshots__/emulation-focus/should-not-affect-screenshots/chromium/grid-cell-0.png b/tests/emulation-focus.spec.ts-snapshots/should-not-affect-screenshots-chromium-grid-cell-0.png similarity index 100% rename from tests/__snapshots__/emulation-focus/should-not-affect-screenshots/chromium/grid-cell-0.png rename to tests/emulation-focus.spec.ts-snapshots/should-not-affect-screenshots-chromium-grid-cell-0.png diff --git a/tests/__snapshots__/emulation-focus/should-not-affect-screenshots/chromium/screenshot-sanity.png b/tests/emulation-focus.spec.ts-snapshots/should-not-affect-screenshots-chromium-screenshot-sanity.png similarity index 100% rename from tests/__snapshots__/emulation-focus/should-not-affect-screenshots/chromium/screenshot-sanity.png rename to tests/emulation-focus.spec.ts-snapshots/should-not-affect-screenshots-chromium-screenshot-sanity.png diff --git a/tests/__snapshots__/emulation-focus/should-not-affect-screenshots/firefox/grid-cell-0.png b/tests/emulation-focus.spec.ts-snapshots/should-not-affect-screenshots-firefox-grid-cell-0.png similarity index 100% rename from tests/__snapshots__/emulation-focus/should-not-affect-screenshots/firefox/grid-cell-0.png rename to tests/emulation-focus.spec.ts-snapshots/should-not-affect-screenshots-firefox-grid-cell-0.png diff --git a/tests/__snapshots__/emulation-focus/should-not-affect-screenshots/firefox/screenshot-sanity.png b/tests/emulation-focus.spec.ts-snapshots/should-not-affect-screenshots-firefox-screenshot-sanity.png similarity index 100% rename from tests/__snapshots__/emulation-focus/should-not-affect-screenshots/firefox/screenshot-sanity.png rename to tests/emulation-focus.spec.ts-snapshots/should-not-affect-screenshots-firefox-screenshot-sanity.png diff --git a/tests/__snapshots__/emulation-focus/should-not-affect-screenshots/webkit/grid-cell-0.png b/tests/emulation-focus.spec.ts-snapshots/should-not-affect-screenshots-webkit-grid-cell-0.png similarity index 100% rename from tests/__snapshots__/emulation-focus/should-not-affect-screenshots/webkit/grid-cell-0.png rename to tests/emulation-focus.spec.ts-snapshots/should-not-affect-screenshots-webkit-grid-cell-0.png diff --git a/tests/__snapshots__/emulation-focus/should-not-affect-screenshots/webkit/screenshot-sanity.png b/tests/emulation-focus.spec.ts-snapshots/should-not-affect-screenshots-webkit-screenshot-sanity.png similarity index 100% rename from tests/__snapshots__/emulation-focus/should-not-affect-screenshots/webkit/screenshot-sanity.png rename to tests/emulation-focus.spec.ts-snapshots/should-not-affect-screenshots-webkit-screenshot-sanity.png diff --git a/tests/headful.spec.ts b/tests/headful.spec.ts index 94a90ef3a2..59be413311 100644 --- a/tests/headful.spec.ts +++ b/tests/headful.spec.ts @@ -154,7 +154,7 @@ it('focused input should produce the same screenshot', async ({browserType, brow it.skip(browserName === 'webkit' && platform === 'linux', 'gtk vs wpe'); it.skip(!!process.env.CRPATH); - testInfo.snapshotPathSegment = browserName + '-' + platform; + testInfo.snapshotSuffix = browserName + '-' + platform; const headful = await browserType.launch({...browserOptions, headless: false }); const headfulPage = await headful.newPage(); diff --git a/tests/__snapshots__/headful/focused-input-should-produce-the-same-screenshot/chromium-darwin/focused-input.png b/tests/headful.spec.ts-snapshots/focused-input-should-produce-the-same-screenshot-chromium-darwin-focused-input.png similarity index 100% rename from tests/__snapshots__/headful/focused-input-should-produce-the-same-screenshot/chromium-darwin/focused-input.png rename to tests/headful.spec.ts-snapshots/focused-input-should-produce-the-same-screenshot-chromium-darwin-focused-input.png diff --git a/tests/__snapshots__/headful/focused-input-should-produce-the-same-screenshot/chromium-linux/focused-input.png b/tests/headful.spec.ts-snapshots/focused-input-should-produce-the-same-screenshot-chromium-linux-focused-input.png similarity index 100% rename from tests/__snapshots__/headful/focused-input-should-produce-the-same-screenshot/chromium-linux/focused-input.png rename to tests/headful.spec.ts-snapshots/focused-input-should-produce-the-same-screenshot-chromium-linux-focused-input.png diff --git a/tests/__snapshots__/headful/focused-input-should-produce-the-same-screenshot/chromium-win32/focused-input.png b/tests/headful.spec.ts-snapshots/focused-input-should-produce-the-same-screenshot-chromium-win32-focused-input.png similarity index 100% rename from tests/__snapshots__/headful/focused-input-should-produce-the-same-screenshot/chromium-win32/focused-input.png rename to tests/headful.spec.ts-snapshots/focused-input-should-produce-the-same-screenshot-chromium-win32-focused-input.png diff --git a/tests/__snapshots__/headful/focused-input-should-produce-the-same-screenshot/firefox-darwin/focused-input.png b/tests/headful.spec.ts-snapshots/focused-input-should-produce-the-same-screenshot-firefox-darwin-focused-input.png similarity index 100% rename from tests/__snapshots__/headful/focused-input-should-produce-the-same-screenshot/firefox-darwin/focused-input.png rename to tests/headful.spec.ts-snapshots/focused-input-should-produce-the-same-screenshot-firefox-darwin-focused-input.png diff --git a/tests/__snapshots__/headful/focused-input-should-produce-the-same-screenshot/firefox-linux/focused-input.png b/tests/headful.spec.ts-snapshots/focused-input-should-produce-the-same-screenshot-firefox-linux-focused-input.png similarity index 100% rename from tests/__snapshots__/headful/focused-input-should-produce-the-same-screenshot/firefox-linux/focused-input.png rename to tests/headful.spec.ts-snapshots/focused-input-should-produce-the-same-screenshot-firefox-linux-focused-input.png diff --git a/tests/__snapshots__/headful/focused-input-should-produce-the-same-screenshot/firefox-win32/focused-input.png b/tests/headful.spec.ts-snapshots/focused-input-should-produce-the-same-screenshot-firefox-win32-focused-input.png similarity index 100% rename from tests/__snapshots__/headful/focused-input-should-produce-the-same-screenshot/firefox-win32/focused-input.png rename to tests/headful.spec.ts-snapshots/focused-input-should-produce-the-same-screenshot-firefox-win32-focused-input.png diff --git a/tests/__snapshots__/headful/focused-input-should-produce-the-same-screenshot/webkit-darwin/focused-input.png b/tests/headful.spec.ts-snapshots/focused-input-should-produce-the-same-screenshot-webkit-darwin-focused-input.png similarity index 100% rename from tests/__snapshots__/headful/focused-input-should-produce-the-same-screenshot/webkit-darwin/focused-input.png rename to tests/headful.spec.ts-snapshots/focused-input-should-produce-the-same-screenshot-webkit-darwin-focused-input.png diff --git a/tests/__snapshots__/headful/focused-input-should-produce-the-same-screenshot/webkit-linux/focused-input.png b/tests/headful.spec.ts-snapshots/focused-input-should-produce-the-same-screenshot-webkit-linux-focused-input.png similarity index 100% rename from tests/__snapshots__/headful/focused-input-should-produce-the-same-screenshot/webkit-linux/focused-input.png rename to tests/headful.spec.ts-snapshots/focused-input-should-produce-the-same-screenshot-webkit-linux-focused-input.png diff --git a/tests/__snapshots__/headful/focused-input-should-produce-the-same-screenshot/webkit-win32/focused-input.png b/tests/headful.spec.ts-snapshots/focused-input-should-produce-the-same-screenshot-webkit-win32-focused-input.png similarity index 100% rename from tests/__snapshots__/headful/focused-input-should-produce-the-same-screenshot/webkit-win32/focused-input.png rename to tests/headful.spec.ts-snapshots/focused-input-should-produce-the-same-screenshot-webkit-win32-focused-input.png diff --git a/tests/__snapshots__/page/elementhandle-screenshot/path-option-should-create-subdirectories/chromium/screenshot-element-bounding-box.png b/tests/page/elementhandle-screenshot.spec.ts-snapshots/path-option-should-create-subdirectories-chromium-screenshot-element-bounding-box.png similarity index 100% rename from tests/__snapshots__/page/elementhandle-screenshot/path-option-should-create-subdirectories/chromium/screenshot-element-bounding-box.png rename to tests/page/elementhandle-screenshot.spec.ts-snapshots/path-option-should-create-subdirectories-chromium-screenshot-element-bounding-box.png diff --git a/tests/__snapshots__/page/elementhandle-screenshot/path-option-should-create-subdirectories/firefox/screenshot-element-bounding-box.png b/tests/page/elementhandle-screenshot.spec.ts-snapshots/path-option-should-create-subdirectories-firefox-screenshot-element-bounding-box.png similarity index 100% rename from tests/__snapshots__/page/elementhandle-screenshot/path-option-should-create-subdirectories/firefox/screenshot-element-bounding-box.png rename to tests/page/elementhandle-screenshot.spec.ts-snapshots/path-option-should-create-subdirectories-firefox-screenshot-element-bounding-box.png diff --git a/tests/__snapshots__/page/elementhandle-screenshot/path-option-should-create-subdirectories/webkit/screenshot-element-bounding-box.png b/tests/page/elementhandle-screenshot.spec.ts-snapshots/path-option-should-create-subdirectories-webkit-screenshot-element-bounding-box.png similarity index 100% rename from tests/__snapshots__/page/elementhandle-screenshot/path-option-should-create-subdirectories/webkit/screenshot-element-bounding-box.png rename to tests/page/elementhandle-screenshot.spec.ts-snapshots/path-option-should-create-subdirectories-webkit-screenshot-element-bounding-box.png diff --git a/tests/__snapshots__/page/elementhandle-screenshot/should-capture-full-element-when-larger-than-viewport-in-parallel/chromium/screenshot-element-larger-than-viewport.png b/tests/page/elementhandle-screenshot.spec.ts-snapshots/should-capture-full-element-when-larger-than-viewport-chromium-screenshot-element-larger-than-viewport.png similarity index 100% rename from tests/__snapshots__/page/elementhandle-screenshot/should-capture-full-element-when-larger-than-viewport-in-parallel/chromium/screenshot-element-larger-than-viewport.png rename to tests/page/elementhandle-screenshot.spec.ts-snapshots/should-capture-full-element-when-larger-than-viewport-chromium-screenshot-element-larger-than-viewport.png diff --git a/tests/__snapshots__/page/elementhandle-screenshot/should-capture-full-element-when-larger-than-viewport-in-parallel/firefox/screenshot-element-larger-than-viewport.png b/tests/page/elementhandle-screenshot.spec.ts-snapshots/should-capture-full-element-when-larger-than-viewport-firefox-screenshot-element-larger-than-viewport.png similarity index 100% rename from tests/__snapshots__/page/elementhandle-screenshot/should-capture-full-element-when-larger-than-viewport-in-parallel/firefox/screenshot-element-larger-than-viewport.png rename to tests/page/elementhandle-screenshot.spec.ts-snapshots/should-capture-full-element-when-larger-than-viewport-firefox-screenshot-element-larger-than-viewport.png diff --git a/tests/__snapshots__/page/elementhandle-screenshot/should-capture-full-element-when-larger-than-viewport/chromium/screenshot-element-larger-than-viewport.png b/tests/page/elementhandle-screenshot.spec.ts-snapshots/should-capture-full-element-when-larger-than-viewport-in-parallel-chromium-screenshot-element-larger-than-viewport.png similarity index 100% rename from tests/__snapshots__/page/elementhandle-screenshot/should-capture-full-element-when-larger-than-viewport/chromium/screenshot-element-larger-than-viewport.png rename to tests/page/elementhandle-screenshot.spec.ts-snapshots/should-capture-full-element-when-larger-than-viewport-in-parallel-chromium-screenshot-element-larger-than-viewport.png diff --git a/tests/__snapshots__/page/elementhandle-screenshot/should-capture-full-element-when-larger-than-viewport/firefox/screenshot-element-larger-than-viewport.png b/tests/page/elementhandle-screenshot.spec.ts-snapshots/should-capture-full-element-when-larger-than-viewport-in-parallel-firefox-screenshot-element-larger-than-viewport.png similarity index 100% rename from tests/__snapshots__/page/elementhandle-screenshot/should-capture-full-element-when-larger-than-viewport/firefox/screenshot-element-larger-than-viewport.png rename to tests/page/elementhandle-screenshot.spec.ts-snapshots/should-capture-full-element-when-larger-than-viewport-in-parallel-firefox-screenshot-element-larger-than-viewport.png diff --git a/tests/__snapshots__/page/elementhandle-screenshot/should-capture-full-element-when-larger-than-viewport-in-parallel/webkit/screenshot-element-larger-than-viewport.png b/tests/page/elementhandle-screenshot.spec.ts-snapshots/should-capture-full-element-when-larger-than-viewport-in-parallel-webkit-screenshot-element-larger-than-viewport.png similarity index 100% rename from tests/__snapshots__/page/elementhandle-screenshot/should-capture-full-element-when-larger-than-viewport-in-parallel/webkit/screenshot-element-larger-than-viewport.png rename to tests/page/elementhandle-screenshot.spec.ts-snapshots/should-capture-full-element-when-larger-than-viewport-in-parallel-webkit-screenshot-element-larger-than-viewport.png diff --git a/tests/__snapshots__/page/elementhandle-screenshot/should-capture-full-element-when-larger-than-viewport/webkit/screenshot-element-larger-than-viewport.png b/tests/page/elementhandle-screenshot.spec.ts-snapshots/should-capture-full-element-when-larger-than-viewport-webkit-screenshot-element-larger-than-viewport.png similarity index 100% rename from tests/__snapshots__/page/elementhandle-screenshot/should-capture-full-element-when-larger-than-viewport/webkit/screenshot-element-larger-than-viewport.png rename to tests/page/elementhandle-screenshot.spec.ts-snapshots/should-capture-full-element-when-larger-than-viewport-webkit-screenshot-element-larger-than-viewport.png diff --git a/tests/__snapshots__/page/elementhandle-screenshot/should-scroll-15000px-into-view/chromium/screenshot-element-scrolled-into-view.png b/tests/page/elementhandle-screenshot.spec.ts-snapshots/should-scroll-15000px-into-view-chromium-screenshot-element-scrolled-into-view.png similarity index 100% rename from tests/__snapshots__/page/elementhandle-screenshot/should-scroll-15000px-into-view/chromium/screenshot-element-scrolled-into-view.png rename to tests/page/elementhandle-screenshot.spec.ts-snapshots/should-scroll-15000px-into-view-chromium-screenshot-element-scrolled-into-view.png diff --git a/tests/__snapshots__/page/elementhandle-screenshot/should-scroll-15000px-into-view/firefox/screenshot-element-scrolled-into-view.png b/tests/page/elementhandle-screenshot.spec.ts-snapshots/should-scroll-15000px-into-view-firefox-screenshot-element-scrolled-into-view.png similarity index 100% rename from tests/__snapshots__/page/elementhandle-screenshot/should-scroll-15000px-into-view/firefox/screenshot-element-scrolled-into-view.png rename to tests/page/elementhandle-screenshot.spec.ts-snapshots/should-scroll-15000px-into-view-firefox-screenshot-element-scrolled-into-view.png diff --git a/tests/__snapshots__/page/elementhandle-screenshot/should-scroll-15000px-into-view/webkit/screenshot-element-scrolled-into-view.png b/tests/page/elementhandle-screenshot.spec.ts-snapshots/should-scroll-15000px-into-view-webkit-screenshot-element-scrolled-into-view.png similarity index 100% rename from tests/__snapshots__/page/elementhandle-screenshot/should-scroll-15000px-into-view/webkit/screenshot-element-scrolled-into-view.png rename to tests/page/elementhandle-screenshot.spec.ts-snapshots/should-scroll-15000px-into-view-webkit-screenshot-element-scrolled-into-view.png diff --git a/tests/__snapshots__/page/elementhandle-screenshot/should-scroll-element-into-view/chromium/screenshot-element-scrolled-into-view.png b/tests/page/elementhandle-screenshot.spec.ts-snapshots/should-scroll-element-into-view-chromium-screenshot-element-scrolled-into-view.png similarity index 100% rename from tests/__snapshots__/page/elementhandle-screenshot/should-scroll-element-into-view/chromium/screenshot-element-scrolled-into-view.png rename to tests/page/elementhandle-screenshot.spec.ts-snapshots/should-scroll-element-into-view-chromium-screenshot-element-scrolled-into-view.png diff --git a/tests/__snapshots__/page/elementhandle-screenshot/should-scroll-element-into-view/firefox/screenshot-element-scrolled-into-view.png b/tests/page/elementhandle-screenshot.spec.ts-snapshots/should-scroll-element-into-view-firefox-screenshot-element-scrolled-into-view.png similarity index 100% rename from tests/__snapshots__/page/elementhandle-screenshot/should-scroll-element-into-view/firefox/screenshot-element-scrolled-into-view.png rename to tests/page/elementhandle-screenshot.spec.ts-snapshots/should-scroll-element-into-view-firefox-screenshot-element-scrolled-into-view.png diff --git a/tests/__snapshots__/page/elementhandle-screenshot/should-scroll-element-into-view/webkit/screenshot-element-scrolled-into-view.png b/tests/page/elementhandle-screenshot.spec.ts-snapshots/should-scroll-element-into-view-webkit-screenshot-element-scrolled-into-view.png similarity index 100% rename from tests/__snapshots__/page/elementhandle-screenshot/should-scroll-element-into-view/webkit/screenshot-element-scrolled-into-view.png rename to tests/page/elementhandle-screenshot.spec.ts-snapshots/should-scroll-element-into-view-webkit-screenshot-element-scrolled-into-view.png diff --git a/tests/__snapshots__/page/elementhandle-screenshot/should-take-into-account-padding-and-border/chromium/screenshot-element-padding-border.png b/tests/page/elementhandle-screenshot.spec.ts-snapshots/should-take-into-account-padding-and-border-chromium-screenshot-element-padding-border.png similarity index 100% rename from tests/__snapshots__/page/elementhandle-screenshot/should-take-into-account-padding-and-border/chromium/screenshot-element-padding-border.png rename to tests/page/elementhandle-screenshot.spec.ts-snapshots/should-take-into-account-padding-and-border-chromium-screenshot-element-padding-border.png diff --git a/tests/__snapshots__/page/elementhandle-screenshot/should-take-into-account-padding-and-border/firefox/screenshot-element-padding-border.png b/tests/page/elementhandle-screenshot.spec.ts-snapshots/should-take-into-account-padding-and-border-firefox-screenshot-element-padding-border.png similarity index 100% rename from tests/__snapshots__/page/elementhandle-screenshot/should-take-into-account-padding-and-border/firefox/screenshot-element-padding-border.png rename to tests/page/elementhandle-screenshot.spec.ts-snapshots/should-take-into-account-padding-and-border-firefox-screenshot-element-padding-border.png diff --git a/tests/__snapshots__/page/elementhandle-screenshot/should-take-into-account-padding-and-border/webkit/screenshot-element-padding-border.png b/tests/page/elementhandle-screenshot.spec.ts-snapshots/should-take-into-account-padding-and-border-webkit-screenshot-element-padding-border.png similarity index 100% rename from tests/__snapshots__/page/elementhandle-screenshot/should-take-into-account-padding-and-border/webkit/screenshot-element-padding-border.png rename to tests/page/elementhandle-screenshot.spec.ts-snapshots/should-take-into-account-padding-and-border-webkit-screenshot-element-padding-border.png diff --git a/tests/__snapshots__/page/elementhandle-screenshot/should-wait-for-element-to-stop-moving/chromium/screenshot-element-bounding-box.png b/tests/page/elementhandle-screenshot.spec.ts-snapshots/should-wait-for-element-to-stop-moving-chromium-screenshot-element-bounding-box.png similarity index 100% rename from tests/__snapshots__/page/elementhandle-screenshot/should-wait-for-element-to-stop-moving/chromium/screenshot-element-bounding-box.png rename to tests/page/elementhandle-screenshot.spec.ts-snapshots/should-wait-for-element-to-stop-moving-chromium-screenshot-element-bounding-box.png diff --git a/tests/__snapshots__/page/elementhandle-screenshot/should-wait-for-element-to-stop-moving/firefox/screenshot-element-bounding-box.png b/tests/page/elementhandle-screenshot.spec.ts-snapshots/should-wait-for-element-to-stop-moving-firefox-screenshot-element-bounding-box.png similarity index 100% rename from tests/__snapshots__/page/elementhandle-screenshot/should-wait-for-element-to-stop-moving/firefox/screenshot-element-bounding-box.png rename to tests/page/elementhandle-screenshot.spec.ts-snapshots/should-wait-for-element-to-stop-moving-firefox-screenshot-element-bounding-box.png diff --git a/tests/__snapshots__/page/elementhandle-screenshot/should-wait-for-element-to-stop-moving/webkit/screenshot-element-bounding-box.png b/tests/page/elementhandle-screenshot.spec.ts-snapshots/should-wait-for-element-to-stop-moving-webkit-screenshot-element-bounding-box.png similarity index 100% rename from tests/__snapshots__/page/elementhandle-screenshot/should-wait-for-element-to-stop-moving/webkit/screenshot-element-bounding-box.png rename to tests/page/elementhandle-screenshot.spec.ts-snapshots/should-wait-for-element-to-stop-moving-webkit-screenshot-element-bounding-box.png diff --git a/tests/__snapshots__/page/elementhandle-screenshot/should-wait-for-visible/chromium/screenshot-element-bounding-box.png b/tests/page/elementhandle-screenshot.spec.ts-snapshots/should-wait-for-visible-chromium-screenshot-element-bounding-box.png similarity index 100% rename from tests/__snapshots__/page/elementhandle-screenshot/should-wait-for-visible/chromium/screenshot-element-bounding-box.png rename to tests/page/elementhandle-screenshot.spec.ts-snapshots/should-wait-for-visible-chromium-screenshot-element-bounding-box.png diff --git a/tests/__snapshots__/page/elementhandle-screenshot/should-wait-for-visible/firefox/screenshot-element-bounding-box.png b/tests/page/elementhandle-screenshot.spec.ts-snapshots/should-wait-for-visible-firefox-screenshot-element-bounding-box.png similarity index 100% rename from tests/__snapshots__/page/elementhandle-screenshot/should-wait-for-visible/firefox/screenshot-element-bounding-box.png rename to tests/page/elementhandle-screenshot.spec.ts-snapshots/should-wait-for-visible-firefox-screenshot-element-bounding-box.png diff --git a/tests/__snapshots__/page/elementhandle-screenshot/should-wait-for-visible/webkit/screenshot-element-bounding-box.png b/tests/page/elementhandle-screenshot.spec.ts-snapshots/should-wait-for-visible-webkit-screenshot-element-bounding-box.png similarity index 100% rename from tests/__snapshots__/page/elementhandle-screenshot/should-wait-for-visible/webkit/screenshot-element-bounding-box.png rename to tests/page/elementhandle-screenshot.spec.ts-snapshots/should-wait-for-visible-webkit-screenshot-element-bounding-box.png diff --git a/tests/__snapshots__/page/elementhandle-screenshot/should-work/chromium/screenshot-element-bounding-box.png b/tests/page/elementhandle-screenshot.spec.ts-snapshots/should-work-chromium-screenshot-element-bounding-box.png similarity index 100% rename from tests/__snapshots__/page/elementhandle-screenshot/should-work/chromium/screenshot-element-bounding-box.png rename to tests/page/elementhandle-screenshot.spec.ts-snapshots/should-work-chromium-screenshot-element-bounding-box.png diff --git a/tests/__snapshots__/page/elementhandle-screenshot/should-work/firefox/screenshot-element-bounding-box.png b/tests/page/elementhandle-screenshot.spec.ts-snapshots/should-work-firefox-screenshot-element-bounding-box.png similarity index 100% rename from tests/__snapshots__/page/elementhandle-screenshot/should-work/firefox/screenshot-element-bounding-box.png rename to tests/page/elementhandle-screenshot.spec.ts-snapshots/should-work-firefox-screenshot-element-bounding-box.png diff --git a/tests/__snapshots__/page/elementhandle-screenshot/should-work-for-an-element-with-an-offset/chromium/screenshot-element-fractional-offset.png b/tests/page/elementhandle-screenshot.spec.ts-snapshots/should-work-for-an-element-with-an-offset-chromium-screenshot-element-fractional-offset.png similarity index 100% rename from tests/__snapshots__/page/elementhandle-screenshot/should-work-for-an-element-with-an-offset/chromium/screenshot-element-fractional-offset.png rename to tests/page/elementhandle-screenshot.spec.ts-snapshots/should-work-for-an-element-with-an-offset-chromium-screenshot-element-fractional-offset.png diff --git a/tests/__snapshots__/page/elementhandle-screenshot/should-work-for-an-element-with-an-offset/firefox/screenshot-element-fractional-offset.png b/tests/page/elementhandle-screenshot.spec.ts-snapshots/should-work-for-an-element-with-an-offset-firefox-screenshot-element-fractional-offset.png similarity index 100% rename from tests/__snapshots__/page/elementhandle-screenshot/should-work-for-an-element-with-an-offset/firefox/screenshot-element-fractional-offset.png rename to tests/page/elementhandle-screenshot.spec.ts-snapshots/should-work-for-an-element-with-an-offset-firefox-screenshot-element-fractional-offset.png diff --git a/tests/__snapshots__/page/elementhandle-screenshot/should-work-for-an-element-with-an-offset/webkit/screenshot-element-fractional-offset.png b/tests/page/elementhandle-screenshot.spec.ts-snapshots/should-work-for-an-element-with-an-offset-webkit-screenshot-element-fractional-offset.png similarity index 100% rename from tests/__snapshots__/page/elementhandle-screenshot/should-work-for-an-element-with-an-offset/webkit/screenshot-element-fractional-offset.png rename to tests/page/elementhandle-screenshot.spec.ts-snapshots/should-work-for-an-element-with-an-offset-webkit-screenshot-element-fractional-offset.png diff --git a/tests/__snapshots__/page/elementhandle-screenshot/should-work-for-an-element-with-fractional-dimensions/chromium/screenshot-element-fractional.png b/tests/page/elementhandle-screenshot.spec.ts-snapshots/should-work-for-an-element-with-fractional-dimensions-chromium-screenshot-element-fractional.png similarity index 100% rename from tests/__snapshots__/page/elementhandle-screenshot/should-work-for-an-element-with-fractional-dimensions/chromium/screenshot-element-fractional.png rename to tests/page/elementhandle-screenshot.spec.ts-snapshots/should-work-for-an-element-with-fractional-dimensions-chromium-screenshot-element-fractional.png diff --git a/tests/__snapshots__/page/elementhandle-screenshot/should-work-for-an-element-with-fractional-dimensions/firefox/screenshot-element-fractional.png b/tests/page/elementhandle-screenshot.spec.ts-snapshots/should-work-for-an-element-with-fractional-dimensions-firefox-screenshot-element-fractional.png similarity index 100% rename from tests/__snapshots__/page/elementhandle-screenshot/should-work-for-an-element-with-fractional-dimensions/firefox/screenshot-element-fractional.png rename to tests/page/elementhandle-screenshot.spec.ts-snapshots/should-work-for-an-element-with-fractional-dimensions-firefox-screenshot-element-fractional.png diff --git a/tests/__snapshots__/page/elementhandle-screenshot/should-work-for-an-element-with-fractional-dimensions/webkit/screenshot-element-fractional.png b/tests/page/elementhandle-screenshot.spec.ts-snapshots/should-work-for-an-element-with-fractional-dimensions-webkit-screenshot-element-fractional.png similarity index 100% rename from tests/__snapshots__/page/elementhandle-screenshot/should-work-for-an-element-with-fractional-dimensions/webkit/screenshot-element-fractional.png rename to tests/page/elementhandle-screenshot.spec.ts-snapshots/should-work-for-an-element-with-fractional-dimensions-webkit-screenshot-element-fractional.png diff --git a/tests/__snapshots__/page/elementhandle-screenshot/should-work/webkit/screenshot-element-bounding-box.png b/tests/page/elementhandle-screenshot.spec.ts-snapshots/should-work-webkit-screenshot-element-bounding-box.png similarity index 100% rename from tests/__snapshots__/page/elementhandle-screenshot/should-work/webkit/screenshot-element-bounding-box.png rename to tests/page/elementhandle-screenshot.spec.ts-snapshots/should-work-webkit-screenshot-element-bounding-box.png diff --git a/tests/__snapshots__/page/elementhandle-screenshot/should-work-with-a-rotated-element/chromium/screenshot-element-rotate.png b/tests/page/elementhandle-screenshot.spec.ts-snapshots/should-work-with-a-rotated-element-chromium-screenshot-element-rotate.png similarity index 100% rename from tests/__snapshots__/page/elementhandle-screenshot/should-work-with-a-rotated-element/chromium/screenshot-element-rotate.png rename to tests/page/elementhandle-screenshot.spec.ts-snapshots/should-work-with-a-rotated-element-chromium-screenshot-element-rotate.png diff --git a/tests/__snapshots__/page/elementhandle-screenshot/should-work-with-a-rotated-element/firefox/screenshot-element-rotate.png b/tests/page/elementhandle-screenshot.spec.ts-snapshots/should-work-with-a-rotated-element-firefox-screenshot-element-rotate.png similarity index 100% rename from tests/__snapshots__/page/elementhandle-screenshot/should-work-with-a-rotated-element/firefox/screenshot-element-rotate.png rename to tests/page/elementhandle-screenshot.spec.ts-snapshots/should-work-with-a-rotated-element-firefox-screenshot-element-rotate.png diff --git a/tests/__snapshots__/page/elementhandle-screenshot/should-work-with-a-rotated-element/webkit/screenshot-element-rotate.png b/tests/page/elementhandle-screenshot.spec.ts-snapshots/should-work-with-a-rotated-element-webkit-screenshot-element-rotate.png similarity index 100% rename from tests/__snapshots__/page/elementhandle-screenshot/should-work-with-a-rotated-element/webkit/screenshot-element-rotate.png rename to tests/page/elementhandle-screenshot.spec.ts-snapshots/should-work-with-a-rotated-element-webkit-screenshot-element-rotate.png diff --git a/tests/__snapshots__/page/page-request-fulfill/should-allow-mocking-binary-responses/chromium/mock-binary-response.png b/tests/page/page-request-fulfill.spec.ts-snapshots/should-allow-mocking-binary-responses-chromium-mock-binary-response.png similarity index 100% rename from tests/__snapshots__/page/page-request-fulfill/should-allow-mocking-binary-responses/chromium/mock-binary-response.png rename to tests/page/page-request-fulfill.spec.ts-snapshots/should-allow-mocking-binary-responses-chromium-mock-binary-response.png diff --git a/tests/__snapshots__/page/page-request-fulfill/should-allow-mocking-binary-responses/firefox/mock-binary-response.png b/tests/page/page-request-fulfill.spec.ts-snapshots/should-allow-mocking-binary-responses-firefox-mock-binary-response.png similarity index 100% rename from tests/__snapshots__/page/page-request-fulfill/should-allow-mocking-binary-responses/firefox/mock-binary-response.png rename to tests/page/page-request-fulfill.spec.ts-snapshots/should-allow-mocking-binary-responses-firefox-mock-binary-response.png diff --git a/tests/__snapshots__/page/page-request-fulfill/should-allow-mocking-binary-responses/webkit/mock-binary-response.png b/tests/page/page-request-fulfill.spec.ts-snapshots/should-allow-mocking-binary-responses-webkit-mock-binary-response.png similarity index 100% rename from tests/__snapshots__/page/page-request-fulfill/should-allow-mocking-binary-responses/webkit/mock-binary-response.png rename to tests/page/page-request-fulfill.spec.ts-snapshots/should-allow-mocking-binary-responses-webkit-mock-binary-response.png diff --git a/tests/__snapshots__/page/page-request-fulfill/should-allow-mocking-svg-with-charset/chromium/mock-svg.png b/tests/page/page-request-fulfill.spec.ts-snapshots/should-allow-mocking-svg-with-charset-chromium-mock-svg.png similarity index 100% rename from tests/__snapshots__/page/page-request-fulfill/should-allow-mocking-svg-with-charset/chromium/mock-svg.png rename to tests/page/page-request-fulfill.spec.ts-snapshots/should-allow-mocking-svg-with-charset-chromium-mock-svg.png diff --git a/tests/__snapshots__/page/page-request-fulfill/should-allow-mocking-svg-with-charset/firefox/mock-svg.png b/tests/page/page-request-fulfill.spec.ts-snapshots/should-allow-mocking-svg-with-charset-firefox-mock-svg.png similarity index 100% rename from tests/__snapshots__/page/page-request-fulfill/should-allow-mocking-svg-with-charset/firefox/mock-svg.png rename to tests/page/page-request-fulfill.spec.ts-snapshots/should-allow-mocking-svg-with-charset-firefox-mock-svg.png diff --git a/tests/__snapshots__/page/page-request-fulfill/should-allow-mocking-svg-with-charset/webkit/mock-svg.png b/tests/page/page-request-fulfill.spec.ts-snapshots/should-allow-mocking-svg-with-charset-webkit-mock-svg.png similarity index 100% rename from tests/__snapshots__/page/page-request-fulfill/should-allow-mocking-svg-with-charset/webkit/mock-svg.png rename to tests/page/page-request-fulfill.spec.ts-snapshots/should-allow-mocking-svg-with-charset-webkit-mock-svg.png diff --git a/tests/__snapshots__/page/page-request-fulfill/should-work-with-file-path/chromium/mock-binary-response.png b/tests/page/page-request-fulfill.spec.ts-snapshots/should-work-with-file-path-chromium-mock-binary-response.png similarity index 100% rename from tests/__snapshots__/page/page-request-fulfill/should-work-with-file-path/chromium/mock-binary-response.png rename to tests/page/page-request-fulfill.spec.ts-snapshots/should-work-with-file-path-chromium-mock-binary-response.png diff --git a/tests/__snapshots__/page/page-request-fulfill/should-work-with-file-path/firefox/mock-binary-response.png b/tests/page/page-request-fulfill.spec.ts-snapshots/should-work-with-file-path-firefox-mock-binary-response.png similarity index 100% rename from tests/__snapshots__/page/page-request-fulfill/should-work-with-file-path/firefox/mock-binary-response.png rename to tests/page/page-request-fulfill.spec.ts-snapshots/should-work-with-file-path-firefox-mock-binary-response.png diff --git a/tests/__snapshots__/page/page-request-fulfill/should-work-with-file-path/webkit/mock-binary-response.png b/tests/page/page-request-fulfill.spec.ts-snapshots/should-work-with-file-path-webkit-mock-binary-response.png similarity index 100% rename from tests/__snapshots__/page/page-request-fulfill/should-work-with-file-path/webkit/mock-binary-response.png rename to tests/page/page-request-fulfill.spec.ts-snapshots/should-work-with-file-path-webkit-mock-binary-response.png diff --git a/tests/__snapshots__/page/page-screenshot/path-option-should-create-subdirectories/chromium/screenshot-sanity.png b/tests/page/page-screenshot.spec.ts-snapshots/path-option-should-create-subdirectories-chromium-screenshot-sanity.png similarity index 100% rename from tests/__snapshots__/page/page-screenshot/path-option-should-create-subdirectories/chromium/screenshot-sanity.png rename to tests/page/page-screenshot.spec.ts-snapshots/path-option-should-create-subdirectories-chromium-screenshot-sanity.png diff --git a/tests/__snapshots__/page/page-screenshot/path-option-should-create-subdirectories/firefox/screenshot-sanity.png b/tests/page/page-screenshot.spec.ts-snapshots/path-option-should-create-subdirectories-firefox-screenshot-sanity.png similarity index 100% rename from tests/__snapshots__/page/page-screenshot/path-option-should-create-subdirectories/firefox/screenshot-sanity.png rename to tests/page/page-screenshot.spec.ts-snapshots/path-option-should-create-subdirectories-firefox-screenshot-sanity.png diff --git a/tests/__snapshots__/page/page-screenshot/path-option-should-create-subdirectories/webkit/screenshot-sanity.png b/tests/page/page-screenshot.spec.ts-snapshots/path-option-should-create-subdirectories-webkit-screenshot-sanity.png similarity index 100% rename from tests/__snapshots__/page/page-screenshot/path-option-should-create-subdirectories/webkit/screenshot-sanity.png rename to tests/page/page-screenshot.spec.ts-snapshots/path-option-should-create-subdirectories-webkit-screenshot-sanity.png diff --git a/tests/__snapshots__/page/page-screenshot/path-option-should-detect-jpeg/chromium/white.jpg b/tests/page/page-screenshot.spec.ts-snapshots/path-option-should-detect-jpeg-chromium-white.jpg similarity index 100% rename from tests/__snapshots__/page/page-screenshot/path-option-should-detect-jpeg/chromium/white.jpg rename to tests/page/page-screenshot.spec.ts-snapshots/path-option-should-detect-jpeg-chromium-white.jpg diff --git a/tests/__snapshots__/page/page-screenshot/path-option-should-detect-jpeg/firefox/white.jpg b/tests/page/page-screenshot.spec.ts-snapshots/path-option-should-detect-jpeg-firefox-white.jpg similarity index 100% rename from tests/__snapshots__/page/page-screenshot/path-option-should-detect-jpeg/firefox/white.jpg rename to tests/page/page-screenshot.spec.ts-snapshots/path-option-should-detect-jpeg-firefox-white.jpg diff --git a/tests/__snapshots__/page/page-screenshot/path-option-should-detect-jpeg/webkit/white.jpg b/tests/page/page-screenshot.spec.ts-snapshots/path-option-should-detect-jpeg-webkit-white.jpg similarity index 100% rename from tests/__snapshots__/page/page-screenshot/path-option-should-detect-jpeg/webkit/white.jpg rename to tests/page/page-screenshot.spec.ts-snapshots/path-option-should-detect-jpeg-webkit-white.jpg diff --git a/tests/__snapshots__/page/page-screenshot/path-option-should-work/chromium/screenshot-sanity.png b/tests/page/page-screenshot.spec.ts-snapshots/path-option-should-work-chromium-screenshot-sanity.png similarity index 100% rename from tests/__snapshots__/page/page-screenshot/path-option-should-work/chromium/screenshot-sanity.png rename to tests/page/page-screenshot.spec.ts-snapshots/path-option-should-work-chromium-screenshot-sanity.png diff --git a/tests/__snapshots__/page/page-screenshot/path-option-should-work/firefox/screenshot-sanity.png b/tests/page/page-screenshot.spec.ts-snapshots/path-option-should-work-firefox-screenshot-sanity.png similarity index 100% rename from tests/__snapshots__/page/page-screenshot/path-option-should-work/firefox/screenshot-sanity.png rename to tests/page/page-screenshot.spec.ts-snapshots/path-option-should-work-firefox-screenshot-sanity.png diff --git a/tests/__snapshots__/page/page-screenshot/path-option-should-work/webkit/screenshot-sanity.png b/tests/page/page-screenshot.spec.ts-snapshots/path-option-should-work-webkit-screenshot-sanity.png similarity index 100% rename from tests/__snapshots__/page/page-screenshot/path-option-should-work/webkit/screenshot-sanity.png rename to tests/page/page-screenshot.spec.ts-snapshots/path-option-should-work-webkit-screenshot-sanity.png diff --git a/tests/__snapshots__/page/page-screenshot/should-allow-transparency/chromium/transparent.png b/tests/page/page-screenshot.spec.ts-snapshots/should-allow-transparency-chromium-transparent.png similarity index 100% rename from tests/__snapshots__/page/page-screenshot/should-allow-transparency/chromium/transparent.png rename to tests/page/page-screenshot.spec.ts-snapshots/should-allow-transparency-chromium-transparent.png diff --git a/tests/__snapshots__/page/page-screenshot/should-allow-transparency/webkit/transparent.png b/tests/page/page-screenshot.spec.ts-snapshots/should-allow-transparency-webkit-transparent.png similarity index 100% rename from tests/__snapshots__/page/page-screenshot/should-allow-transparency/webkit/transparent.png rename to tests/page/page-screenshot.spec.ts-snapshots/should-allow-transparency-webkit-transparent.png diff --git a/tests/__snapshots__/page/page-screenshot/should-clip-elements-to-the-viewport/chromium/screenshot-offscreen-clip.png b/tests/page/page-screenshot.spec.ts-snapshots/should-clip-elements-to-the-viewport-chromium-screenshot-offscreen-clip.png similarity index 100% rename from tests/__snapshots__/page/page-screenshot/should-clip-elements-to-the-viewport/chromium/screenshot-offscreen-clip.png rename to tests/page/page-screenshot.spec.ts-snapshots/should-clip-elements-to-the-viewport-chromium-screenshot-offscreen-clip.png diff --git a/tests/__snapshots__/page/page-screenshot/should-clip-elements-to-the-viewport/firefox/screenshot-offscreen-clip.png b/tests/page/page-screenshot.spec.ts-snapshots/should-clip-elements-to-the-viewport-firefox-screenshot-offscreen-clip.png similarity index 100% rename from tests/__snapshots__/page/page-screenshot/should-clip-elements-to-the-viewport/firefox/screenshot-offscreen-clip.png rename to tests/page/page-screenshot.spec.ts-snapshots/should-clip-elements-to-the-viewport-firefox-screenshot-offscreen-clip.png diff --git a/tests/__snapshots__/page/page-screenshot/should-clip-elements-to-the-viewport/webkit/screenshot-offscreen-clip.png b/tests/page/page-screenshot.spec.ts-snapshots/should-clip-elements-to-the-viewport-webkit-screenshot-offscreen-clip.png similarity index 100% rename from tests/__snapshots__/page/page-screenshot/should-clip-elements-to-the-viewport/webkit/screenshot-offscreen-clip.png rename to tests/page/page-screenshot.spec.ts-snapshots/should-clip-elements-to-the-viewport-webkit-screenshot-offscreen-clip.png diff --git a/tests/__snapshots__/page/page-screenshot/should-clip-rect-with-fullPage/chromium/screenshot-clip-rect.png b/tests/page/page-screenshot.spec.ts-snapshots/should-clip-rect-chromium-screenshot-clip-rect.png similarity index 100% rename from tests/__snapshots__/page/page-screenshot/should-clip-rect-with-fullPage/chromium/screenshot-clip-rect.png rename to tests/page/page-screenshot.spec.ts-snapshots/should-clip-rect-chromium-screenshot-clip-rect.png diff --git a/tests/__snapshots__/page/page-screenshot/should-clip-rect-with-fullPage/firefox/screenshot-clip-rect.png b/tests/page/page-screenshot.spec.ts-snapshots/should-clip-rect-firefox-screenshot-clip-rect.png similarity index 100% rename from tests/__snapshots__/page/page-screenshot/should-clip-rect-with-fullPage/firefox/screenshot-clip-rect.png rename to tests/page/page-screenshot.spec.ts-snapshots/should-clip-rect-firefox-screenshot-clip-rect.png diff --git a/tests/__snapshots__/page/page-screenshot/should-clip-rect-with-fullPage/webkit/screenshot-clip-rect.png b/tests/page/page-screenshot.spec.ts-snapshots/should-clip-rect-webkit-screenshot-clip-rect.png similarity index 100% rename from tests/__snapshots__/page/page-screenshot/should-clip-rect-with-fullPage/webkit/screenshot-clip-rect.png rename to tests/page/page-screenshot.spec.ts-snapshots/should-clip-rect-webkit-screenshot-clip-rect.png diff --git a/tests/__snapshots__/page/page-screenshot/should-clip-rect/chromium/screenshot-clip-rect.png b/tests/page/page-screenshot.spec.ts-snapshots/should-clip-rect-with-fullPage-chromium-screenshot-clip-rect.png similarity index 100% rename from tests/__snapshots__/page/page-screenshot/should-clip-rect/chromium/screenshot-clip-rect.png rename to tests/page/page-screenshot.spec.ts-snapshots/should-clip-rect-with-fullPage-chromium-screenshot-clip-rect.png diff --git a/tests/__snapshots__/page/page-screenshot/should-clip-rect/firefox/screenshot-clip-rect.png b/tests/page/page-screenshot.spec.ts-snapshots/should-clip-rect-with-fullPage-firefox-screenshot-clip-rect.png similarity index 100% rename from tests/__snapshots__/page/page-screenshot/should-clip-rect/firefox/screenshot-clip-rect.png rename to tests/page/page-screenshot.spec.ts-snapshots/should-clip-rect-with-fullPage-firefox-screenshot-clip-rect.png diff --git a/tests/__snapshots__/page/page-screenshot/should-clip-rect/webkit/screenshot-clip-rect.png b/tests/page/page-screenshot.spec.ts-snapshots/should-clip-rect-with-fullPage-webkit-screenshot-clip-rect.png similarity index 100% rename from tests/__snapshots__/page/page-screenshot/should-clip-rect/webkit/screenshot-clip-rect.png rename to tests/page/page-screenshot.spec.ts-snapshots/should-clip-rect-with-fullPage-webkit-screenshot-clip-rect.png diff --git a/tests/__snapshots__/page/page-screenshot/should-render-white-background-on-jpeg-file/chromium/white.jpg b/tests/page/page-screenshot.spec.ts-snapshots/should-render-white-background-on-jpeg-file-chromium-white.jpg similarity index 100% rename from tests/__snapshots__/page/page-screenshot/should-render-white-background-on-jpeg-file/chromium/white.jpg rename to tests/page/page-screenshot.spec.ts-snapshots/should-render-white-background-on-jpeg-file-chromium-white.jpg diff --git a/tests/__snapshots__/page/page-screenshot/should-render-white-background-on-jpeg-file/firefox/white.jpg b/tests/page/page-screenshot.spec.ts-snapshots/should-render-white-background-on-jpeg-file-firefox-white.jpg similarity index 100% rename from tests/__snapshots__/page/page-screenshot/should-render-white-background-on-jpeg-file/firefox/white.jpg rename to tests/page/page-screenshot.spec.ts-snapshots/should-render-white-background-on-jpeg-file-firefox-white.jpg diff --git a/tests/__snapshots__/page/page-screenshot/should-render-white-background-on-jpeg-file/webkit/white.jpg b/tests/page/page-screenshot.spec.ts-snapshots/should-render-white-background-on-jpeg-file-webkit-white.jpg similarity index 100% rename from tests/__snapshots__/page/page-screenshot/should-render-white-background-on-jpeg-file/webkit/white.jpg rename to tests/page/page-screenshot.spec.ts-snapshots/should-render-white-background-on-jpeg-file-webkit-white.jpg diff --git a/tests/__snapshots__/page/page-screenshot/should-run-in-parallel/chromium/grid-cell-1.png b/tests/page/page-screenshot.spec.ts-snapshots/should-run-in-parallel-chromium-grid-cell-1.png similarity index 100% rename from tests/__snapshots__/page/page-screenshot/should-run-in-parallel/chromium/grid-cell-1.png rename to tests/page/page-screenshot.spec.ts-snapshots/should-run-in-parallel-chromium-grid-cell-1.png diff --git a/tests/__snapshots__/page/page-screenshot/should-run-in-parallel/firefox/grid-cell-1.png b/tests/page/page-screenshot.spec.ts-snapshots/should-run-in-parallel-firefox-grid-cell-1.png similarity index 100% rename from tests/__snapshots__/page/page-screenshot/should-run-in-parallel/firefox/grid-cell-1.png rename to tests/page/page-screenshot.spec.ts-snapshots/should-run-in-parallel-firefox-grid-cell-1.png diff --git a/tests/__snapshots__/page/page-screenshot/should-run-in-parallel/webkit/grid-cell-1.png b/tests/page/page-screenshot.spec.ts-snapshots/should-run-in-parallel-webkit-grid-cell-1.png similarity index 100% rename from tests/__snapshots__/page/page-screenshot/should-run-in-parallel/webkit/grid-cell-1.png rename to tests/page/page-screenshot.spec.ts-snapshots/should-run-in-parallel-webkit-grid-cell-1.png diff --git a/tests/__snapshots__/page/page-screenshot/should-take-fullPage-screenshots/chromium/screenshot-grid-fullpage.png b/tests/page/page-screenshot.spec.ts-snapshots/should-take-fullPage-screenshots-chromium-screenshot-grid-fullpage.png similarity index 100% rename from tests/__snapshots__/page/page-screenshot/should-take-fullPage-screenshots/chromium/screenshot-grid-fullpage.png rename to tests/page/page-screenshot.spec.ts-snapshots/should-take-fullPage-screenshots-chromium-screenshot-grid-fullpage.png diff --git a/tests/__snapshots__/page/page-screenshot/should-take-fullPage-screenshots/firefox/screenshot-grid-fullpage.png b/tests/page/page-screenshot.spec.ts-snapshots/should-take-fullPage-screenshots-firefox-screenshot-grid-fullpage.png similarity index 100% rename from tests/__snapshots__/page/page-screenshot/should-take-fullPage-screenshots/firefox/screenshot-grid-fullpage.png rename to tests/page/page-screenshot.spec.ts-snapshots/should-take-fullPage-screenshots-firefox-screenshot-grid-fullpage.png diff --git a/tests/__snapshots__/page/page-screenshot/should-take-fullPage-screenshots/webkit/screenshot-grid-fullpage.png b/tests/page/page-screenshot.spec.ts-snapshots/should-take-fullPage-screenshots-webkit-screenshot-grid-fullpage.png similarity index 100% rename from tests/__snapshots__/page/page-screenshot/should-take-fullPage-screenshots/webkit/screenshot-grid-fullpage.png rename to tests/page/page-screenshot.spec.ts-snapshots/should-take-fullPage-screenshots-webkit-screenshot-grid-fullpage.png diff --git a/tests/__snapshots__/page/page-screenshot/should-work/chromium/screenshot-sanity.png b/tests/page/page-screenshot.spec.ts-snapshots/should-work-chromium-screenshot-sanity.png similarity index 100% rename from tests/__snapshots__/page/page-screenshot/should-work/chromium/screenshot-sanity.png rename to tests/page/page-screenshot.spec.ts-snapshots/should-work-chromium-screenshot-sanity.png diff --git a/tests/__snapshots__/page/page-screenshot/should-work/firefox/screenshot-sanity.png b/tests/page/page-screenshot.spec.ts-snapshots/should-work-firefox-screenshot-sanity.png similarity index 100% rename from tests/__snapshots__/page/page-screenshot/should-work/firefox/screenshot-sanity.png rename to tests/page/page-screenshot.spec.ts-snapshots/should-work-firefox-screenshot-sanity.png diff --git a/tests/__snapshots__/page/page-screenshot/should-work-for-canvas/chromium/screenshot-canvas.png b/tests/page/page-screenshot.spec.ts-snapshots/should-work-for-canvas-chromium-screenshot-canvas.png similarity index 100% rename from tests/__snapshots__/page/page-screenshot/should-work-for-canvas/chromium/screenshot-canvas.png rename to tests/page/page-screenshot.spec.ts-snapshots/should-work-for-canvas-chromium-screenshot-canvas.png diff --git a/tests/__snapshots__/page/page-screenshot/should-work-for-canvas/firefox/screenshot-canvas.png b/tests/page/page-screenshot.spec.ts-snapshots/should-work-for-canvas-firefox-screenshot-canvas.png similarity index 100% rename from tests/__snapshots__/page/page-screenshot/should-work-for-canvas/firefox/screenshot-canvas.png rename to tests/page/page-screenshot.spec.ts-snapshots/should-work-for-canvas-firefox-screenshot-canvas.png diff --git a/tests/__snapshots__/page/page-screenshot/should-work-for-canvas/webkit/screenshot-canvas.png b/tests/page/page-screenshot.spec.ts-snapshots/should-work-for-canvas-webkit-screenshot-canvas.png similarity index 100% rename from tests/__snapshots__/page/page-screenshot/should-work-for-canvas/webkit/screenshot-canvas.png rename to tests/page/page-screenshot.spec.ts-snapshots/should-work-for-canvas-webkit-screenshot-canvas.png diff --git a/tests/__snapshots__/page/page-screenshot/should-work-for-translateZ/chromium/screenshot-translateZ.png b/tests/page/page-screenshot.spec.ts-snapshots/should-work-for-translateZ-chromium-screenshot-translateZ.png similarity index 100% rename from tests/__snapshots__/page/page-screenshot/should-work-for-translateZ/chromium/screenshot-translateZ.png rename to tests/page/page-screenshot.spec.ts-snapshots/should-work-for-translateZ-chromium-screenshot-translateZ.png diff --git a/tests/__snapshots__/page/page-screenshot/should-work-for-translateZ/firefox/screenshot-translateZ.png b/tests/page/page-screenshot.spec.ts-snapshots/should-work-for-translateZ-firefox-screenshot-translateZ.png similarity index 100% rename from tests/__snapshots__/page/page-screenshot/should-work-for-translateZ/firefox/screenshot-translateZ.png rename to tests/page/page-screenshot.spec.ts-snapshots/should-work-for-translateZ-firefox-screenshot-translateZ.png diff --git a/tests/__snapshots__/page/page-screenshot/should-work-for-translateZ/webkit/screenshot-translateZ.png b/tests/page/page-screenshot.spec.ts-snapshots/should-work-for-translateZ-webkit-screenshot-translateZ.png similarity index 100% rename from tests/__snapshots__/page/page-screenshot/should-work-for-translateZ/webkit/screenshot-translateZ.png rename to tests/page/page-screenshot.spec.ts-snapshots/should-work-for-translateZ-webkit-screenshot-translateZ.png diff --git a/tests/__snapshots__/page/page-screenshot/should-work-for-webgl/chromium/screenshot-webgl.png b/tests/page/page-screenshot.spec.ts-snapshots/should-work-for-webgl-chromium-screenshot-webgl.png similarity index 100% rename from tests/__snapshots__/page/page-screenshot/should-work-for-webgl/chromium/screenshot-webgl.png rename to tests/page/page-screenshot.spec.ts-snapshots/should-work-for-webgl-chromium-screenshot-webgl.png diff --git a/tests/__snapshots__/page/page-screenshot/should-work-for-webgl/webkit/screenshot-webgl.png b/tests/page/page-screenshot.spec.ts-snapshots/should-work-for-webgl-webkit-screenshot-webgl.png similarity index 100% rename from tests/__snapshots__/page/page-screenshot/should-work-for-webgl/webkit/screenshot-webgl.png rename to tests/page/page-screenshot.spec.ts-snapshots/should-work-for-webgl-webkit-screenshot-webgl.png diff --git a/tests/__snapshots__/page/page-screenshot/should-work/webkit/screenshot-sanity.png b/tests/page/page-screenshot.spec.ts-snapshots/should-work-webkit-screenshot-sanity.png similarity index 100% rename from tests/__snapshots__/page/page-screenshot/should-work/webkit/screenshot-sanity.png rename to tests/page/page-screenshot.spec.ts-snapshots/should-work-webkit-screenshot-sanity.png diff --git a/tests/__snapshots__/page/page-screenshot/should-work-with-Array-deleted/chromium/screenshot-grid-fullpage.png b/tests/page/page-screenshot.spec.ts-snapshots/should-work-with-Array-deleted-chromium-screenshot-grid-fullpage.png similarity index 100% rename from tests/__snapshots__/page/page-screenshot/should-work-with-Array-deleted/chromium/screenshot-grid-fullpage.png rename to tests/page/page-screenshot.spec.ts-snapshots/should-work-with-Array-deleted-chromium-screenshot-grid-fullpage.png diff --git a/tests/__snapshots__/page/page-screenshot/should-work-with-Array-deleted/firefox/screenshot-grid-fullpage.png b/tests/page/page-screenshot.spec.ts-snapshots/should-work-with-Array-deleted-firefox-screenshot-grid-fullpage.png similarity index 100% rename from tests/__snapshots__/page/page-screenshot/should-work-with-Array-deleted/firefox/screenshot-grid-fullpage.png rename to tests/page/page-screenshot.spec.ts-snapshots/should-work-with-Array-deleted-firefox-screenshot-grid-fullpage.png diff --git a/tests/__snapshots__/page/page-screenshot/should-work-with-Array-deleted/webkit/screenshot-grid-fullpage.png b/tests/page/page-screenshot.spec.ts-snapshots/should-work-with-Array-deleted-webkit-screenshot-grid-fullpage.png similarity index 100% rename from tests/__snapshots__/page/page-screenshot/should-work-with-Array-deleted/webkit/screenshot-grid-fullpage.png rename to tests/page/page-screenshot.spec.ts-snapshots/should-work-with-Array-deleted-webkit-screenshot-grid-fullpage.png diff --git a/tests/__snapshots__/page/page-screenshot/should-work-with-iframe-in-shadow/chromium/screenshot-iframe.png b/tests/page/page-screenshot.spec.ts-snapshots/should-work-with-iframe-in-shadow-chromium-screenshot-iframe.png similarity index 100% rename from tests/__snapshots__/page/page-screenshot/should-work-with-iframe-in-shadow/chromium/screenshot-iframe.png rename to tests/page/page-screenshot.spec.ts-snapshots/should-work-with-iframe-in-shadow-chromium-screenshot-iframe.png diff --git a/tests/__snapshots__/page/page-screenshot/should-work-with-iframe-in-shadow/firefox/screenshot-iframe.png b/tests/page/page-screenshot.spec.ts-snapshots/should-work-with-iframe-in-shadow-firefox-screenshot-iframe.png similarity index 100% rename from tests/__snapshots__/page/page-screenshot/should-work-with-iframe-in-shadow/firefox/screenshot-iframe.png rename to tests/page/page-screenshot.spec.ts-snapshots/should-work-with-iframe-in-shadow-firefox-screenshot-iframe.png diff --git a/tests/__snapshots__/page/page-screenshot/should-work-with-iframe-in-shadow/webkit/screenshot-iframe.png b/tests/page/page-screenshot.spec.ts-snapshots/should-work-with-iframe-in-shadow-webkit-screenshot-iframe.png similarity index 100% rename from tests/__snapshots__/page/page-screenshot/should-work-with-iframe-in-shadow/webkit/screenshot-iframe.png rename to tests/page/page-screenshot.spec.ts-snapshots/should-work-with-iframe-in-shadow-webkit-screenshot-iframe.png diff --git a/tests/__snapshots__/page/page-screenshot/should-work-with-odd-clip-size-on-Retina-displays/chromium/screenshot-clip-odd-size.png b/tests/page/page-screenshot.spec.ts-snapshots/should-work-with-odd-clip-size-on-Retina-displays-chromium-screenshot-clip-odd-size.png similarity index 100% rename from tests/__snapshots__/page/page-screenshot/should-work-with-odd-clip-size-on-Retina-displays/chromium/screenshot-clip-odd-size.png rename to tests/page/page-screenshot.spec.ts-snapshots/should-work-with-odd-clip-size-on-Retina-displays-chromium-screenshot-clip-odd-size.png diff --git a/tests/__snapshots__/page/page-screenshot/should-work-with-odd-clip-size-on-Retina-displays/firefox/screenshot-clip-odd-size.png b/tests/page/page-screenshot.spec.ts-snapshots/should-work-with-odd-clip-size-on-Retina-displays-firefox-screenshot-clip-odd-size.png similarity index 100% rename from tests/__snapshots__/page/page-screenshot/should-work-with-odd-clip-size-on-Retina-displays/firefox/screenshot-clip-odd-size.png rename to tests/page/page-screenshot.spec.ts-snapshots/should-work-with-odd-clip-size-on-Retina-displays-firefox-screenshot-clip-odd-size.png diff --git a/tests/__snapshots__/page/page-screenshot/should-work-with-odd-clip-size-on-Retina-displays/webkit/screenshot-clip-odd-size.png b/tests/page/page-screenshot.spec.ts-snapshots/should-work-with-odd-clip-size-on-Retina-displays-webkit-screenshot-clip-odd-size.png similarity index 100% rename from tests/__snapshots__/page/page-screenshot/should-work-with-odd-clip-size-on-Retina-displays/webkit/screenshot-clip-odd-size.png rename to tests/page/page-screenshot.spec.ts-snapshots/should-work-with-odd-clip-size-on-Retina-displays-webkit-screenshot-clip-odd-size.png diff --git a/tests/__snapshots__/screenshot/element-screenshot-should-work-with-a-mobile-viewport/chromium/screenshot-element-mobile.png b/tests/screenshot.spec.ts-snapshots/element-screenshot-should-work-with-a-mobile-viewport-chromium-screenshot-element-mobile.png similarity index 100% rename from tests/__snapshots__/screenshot/element-screenshot-should-work-with-a-mobile-viewport/chromium/screenshot-element-mobile.png rename to tests/screenshot.spec.ts-snapshots/element-screenshot-should-work-with-a-mobile-viewport-chromium-screenshot-element-mobile.png diff --git a/tests/__snapshots__/screenshot/element-screenshot-should-work-with-a-mobile-viewport/webkit/screenshot-element-mobile.png b/tests/screenshot.spec.ts-snapshots/element-screenshot-should-work-with-a-mobile-viewport-webkit-screenshot-element-mobile.png similarity index 100% rename from tests/__snapshots__/screenshot/element-screenshot-should-work-with-a-mobile-viewport/webkit/screenshot-element-mobile.png rename to tests/screenshot.spec.ts-snapshots/element-screenshot-should-work-with-a-mobile-viewport-webkit-screenshot-element-mobile.png diff --git a/tests/__snapshots__/screenshot/element-screenshot-should-work-with-device-scale-factor/chromium/screenshot-element-mobile-dsf.png b/tests/screenshot.spec.ts-snapshots/element-screenshot-should-work-with-device-scale-factor-chromium-screenshot-element-mobile-dsf.png similarity index 100% rename from tests/__snapshots__/screenshot/element-screenshot-should-work-with-device-scale-factor/chromium/screenshot-element-mobile-dsf.png rename to tests/screenshot.spec.ts-snapshots/element-screenshot-should-work-with-device-scale-factor-chromium-screenshot-element-mobile-dsf.png diff --git a/tests/__snapshots__/screenshot/element-screenshot-should-work-with-device-scale-factor/webkit/screenshot-element-mobile-dsf.png b/tests/screenshot.spec.ts-snapshots/element-screenshot-should-work-with-device-scale-factor-webkit-screenshot-element-mobile-dsf.png similarity index 100% rename from tests/__snapshots__/screenshot/element-screenshot-should-work-with-device-scale-factor/webkit/screenshot-element-mobile-dsf.png rename to tests/screenshot.spec.ts-snapshots/element-screenshot-should-work-with-device-scale-factor-webkit-screenshot-element-mobile-dsf.png diff --git a/tests/__snapshots__/screenshot/should-run-in-parallel-in-multiple-pages/chromium/grid-cell-0.png b/tests/screenshot.spec.ts-snapshots/should-run-in-parallel-in-multiple-pages-chromium-grid-cell-0.png similarity index 100% rename from tests/__snapshots__/screenshot/should-run-in-parallel-in-multiple-pages/chromium/grid-cell-0.png rename to tests/screenshot.spec.ts-snapshots/should-run-in-parallel-in-multiple-pages-chromium-grid-cell-0.png diff --git a/tests/__snapshots__/screenshot/should-run-in-parallel-in-multiple-pages/chromium/grid-cell-1.png b/tests/screenshot.spec.ts-snapshots/should-run-in-parallel-in-multiple-pages-chromium-grid-cell-1.png similarity index 100% rename from tests/__snapshots__/screenshot/should-run-in-parallel-in-multiple-pages/chromium/grid-cell-1.png rename to tests/screenshot.spec.ts-snapshots/should-run-in-parallel-in-multiple-pages-chromium-grid-cell-1.png diff --git a/tests/__snapshots__/screenshot/should-run-in-parallel-in-multiple-pages/firefox/grid-cell-0.png b/tests/screenshot.spec.ts-snapshots/should-run-in-parallel-in-multiple-pages-firefox-grid-cell-0.png similarity index 100% rename from tests/__snapshots__/screenshot/should-run-in-parallel-in-multiple-pages/firefox/grid-cell-0.png rename to tests/screenshot.spec.ts-snapshots/should-run-in-parallel-in-multiple-pages-firefox-grid-cell-0.png diff --git a/tests/__snapshots__/screenshot/should-run-in-parallel-in-multiple-pages/firefox/grid-cell-1.png b/tests/screenshot.spec.ts-snapshots/should-run-in-parallel-in-multiple-pages-firefox-grid-cell-1.png similarity index 100% rename from tests/__snapshots__/screenshot/should-run-in-parallel-in-multiple-pages/firefox/grid-cell-1.png rename to tests/screenshot.spec.ts-snapshots/should-run-in-parallel-in-multiple-pages-firefox-grid-cell-1.png diff --git a/tests/__snapshots__/screenshot/should-run-in-parallel-in-multiple-pages/webkit/grid-cell-0.png b/tests/screenshot.spec.ts-snapshots/should-run-in-parallel-in-multiple-pages-webkit-grid-cell-0.png similarity index 100% rename from tests/__snapshots__/screenshot/should-run-in-parallel-in-multiple-pages/webkit/grid-cell-0.png rename to tests/screenshot.spec.ts-snapshots/should-run-in-parallel-in-multiple-pages-webkit-grid-cell-0.png diff --git a/tests/__snapshots__/screenshot/should-run-in-parallel-in-multiple-pages/webkit/grid-cell-1.png b/tests/screenshot.spec.ts-snapshots/should-run-in-parallel-in-multiple-pages-webkit-grid-cell-1.png similarity index 100% rename from tests/__snapshots__/screenshot/should-run-in-parallel-in-multiple-pages/webkit/grid-cell-1.png rename to tests/screenshot.spec.ts-snapshots/should-run-in-parallel-in-multiple-pages-webkit-grid-cell-1.png diff --git a/tests/__snapshots__/screenshot/should-work-with-a-mobile-viewport-and-clip/chromium/screenshot-mobile-clip.png b/tests/screenshot.spec.ts-snapshots/should-work-with-a-mobile-viewport-and-clip-chromium-screenshot-mobile-clip.png similarity index 100% rename from tests/__snapshots__/screenshot/should-work-with-a-mobile-viewport-and-clip/chromium/screenshot-mobile-clip.png rename to tests/screenshot.spec.ts-snapshots/should-work-with-a-mobile-viewport-and-clip-chromium-screenshot-mobile-clip.png diff --git a/tests/__snapshots__/screenshot/should-work-with-a-mobile-viewport-and-clip/webkit/screenshot-mobile-clip.png b/tests/screenshot.spec.ts-snapshots/should-work-with-a-mobile-viewport-and-clip-webkit-screenshot-mobile-clip.png similarity index 100% rename from tests/__snapshots__/screenshot/should-work-with-a-mobile-viewport-and-clip/webkit/screenshot-mobile-clip.png rename to tests/screenshot.spec.ts-snapshots/should-work-with-a-mobile-viewport-and-clip-webkit-screenshot-mobile-clip.png diff --git a/tests/__snapshots__/screenshot/should-work-with-a-mobile-viewport-and-fullPage/chromium/screenshot-mobile-fullpage.png b/tests/screenshot.spec.ts-snapshots/should-work-with-a-mobile-viewport-and-fullPage-chromium-screenshot-mobile-fullpage.png similarity index 100% rename from tests/__snapshots__/screenshot/should-work-with-a-mobile-viewport-and-fullPage/chromium/screenshot-mobile-fullpage.png rename to tests/screenshot.spec.ts-snapshots/should-work-with-a-mobile-viewport-and-fullPage-chromium-screenshot-mobile-fullpage.png diff --git a/tests/__snapshots__/screenshot/should-work-with-a-mobile-viewport-and-fullPage/webkit/screenshot-mobile-fullpage.png b/tests/screenshot.spec.ts-snapshots/should-work-with-a-mobile-viewport-and-fullPage-webkit-screenshot-mobile-fullpage.png similarity index 100% rename from tests/__snapshots__/screenshot/should-work-with-a-mobile-viewport-and-fullPage/webkit/screenshot-mobile-fullpage.png rename to tests/screenshot.spec.ts-snapshots/should-work-with-a-mobile-viewport-and-fullPage-webkit-screenshot-mobile-fullpage.png diff --git a/tests/__snapshots__/screenshot/should-work-with-a-mobile-viewport/chromium/screenshot-mobile.png b/tests/screenshot.spec.ts-snapshots/should-work-with-a-mobile-viewport-chromium-screenshot-mobile.png similarity index 100% rename from tests/__snapshots__/screenshot/should-work-with-a-mobile-viewport/chromium/screenshot-mobile.png rename to tests/screenshot.spec.ts-snapshots/should-work-with-a-mobile-viewport-chromium-screenshot-mobile.png diff --git a/tests/__snapshots__/screenshot/should-work-with-a-mobile-viewport/webkit/screenshot-mobile.png b/tests/screenshot.spec.ts-snapshots/should-work-with-a-mobile-viewport-webkit-screenshot-mobile.png similarity index 100% rename from tests/__snapshots__/screenshot/should-work-with-a-mobile-viewport/webkit/screenshot-mobile.png rename to tests/screenshot.spec.ts-snapshots/should-work-with-a-mobile-viewport-webkit-screenshot-mobile.png diff --git a/tests/__snapshots__/screenshot/should-work-with-device-scale-factor/chromium/screenshot-device-scale-factor.png b/tests/screenshot.spec.ts-snapshots/should-work-with-device-scale-factor-chromium-screenshot-device-scale-factor.png similarity index 100% rename from tests/__snapshots__/screenshot/should-work-with-device-scale-factor/chromium/screenshot-device-scale-factor.png rename to tests/screenshot.spec.ts-snapshots/should-work-with-device-scale-factor-chromium-screenshot-device-scale-factor.png diff --git a/tests/__snapshots__/screenshot/should-work-with-device-scale-factor/firefox/screenshot-device-scale-factor.png b/tests/screenshot.spec.ts-snapshots/should-work-with-device-scale-factor-firefox-screenshot-device-scale-factor.png similarity index 100% rename from tests/__snapshots__/screenshot/should-work-with-device-scale-factor/firefox/screenshot-device-scale-factor.png rename to tests/screenshot.spec.ts-snapshots/should-work-with-device-scale-factor-firefox-screenshot-device-scale-factor.png diff --git a/tests/__snapshots__/screenshot/should-work-with-device-scale-factor/webkit/screenshot-device-scale-factor.png b/tests/screenshot.spec.ts-snapshots/should-work-with-device-scale-factor-webkit-screenshot-device-scale-factor.png similarity index 100% rename from tests/__snapshots__/screenshot/should-work-with-device-scale-factor/webkit/screenshot-device-scale-factor.png rename to tests/screenshot.spec.ts-snapshots/should-work-with-device-scale-factor-webkit-screenshot-device-scale-factor.png