From db826c9c8c41386a6455a7c89b337f380f474c3c Mon Sep 17 00:00:00 2001
From: Andrey Lushnikov <aslushnikov@gmail.com>
Date: Thu, 10 Nov 2022 15:50:13 -0800
Subject: [PATCH] chore: drive-by fixes for the `snapshotPathTemplate` (#18715)

- Use `snapshotPathTemplate` for docker screenshots in html-reporter
- Mark the snapshot path template test as slow since it re-spawns
  worker for each project.
- Fix docker smoke tests
---
 .github/workflows/tests_secondary.yml                | 11 ++++++++---
 package.json                                         |  1 -
 packages/html-reporter/playwright.config.ts          |  1 +
 tests/playwright-test/snapshot-path-template.spec.ts |  1 +
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/tests_secondary.yml b/.github/workflows/tests_secondary.yml
index b798c07879..89a1d310a0 100644
--- a/.github/workflows/tests_secondary.yml
+++ b/.github/workflows/tests_secondary.yml
@@ -816,9 +816,14 @@ jobs:
         PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
     - run: npm run build
     - run: npx playwright install --with-deps
-    - run: ./utils/docker/build.sh --amd64 focal playwright:localbuild
-    - run: PWTEST_DOCKER_BASE_IMAGE=playwright:localbuild npx playwright docker build
-    - run: xvfb-run --auto-servernum --server-args="-screen 0 1280x960x24" -- npm run dtest
+    - run: |
+        ./utils/docker/build.sh --amd64 focal $PWTEST_DOCKER_BASE_IMAGE
+        npx playwright docker build
+        nohup npx playwright docker start &
+        xvfb-run --auto-servernum --server-args="-screen 0 1280x960x24" -- npm run test -- --grep '@smoke'
+      env:
+        PLAYWRIGHT_DOCKER: 1
+        PWTEST_DOCKER_BASE_IMAGE: playwright:localbuild
     - run: ./utils/upload_flakiness_dashboard.sh ./test-results/report.json
       if: always()
       shell: bash
diff --git a/package.json b/package.json
index 5716007958..07b99afd19 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,6 @@
   },
   "license": "Apache-2.0",
   "scripts": {
-    "dtest": "cross-env PLAYWRIGHT_DOCKER=1 playwright test --config=tests/library/playwright.config.ts --grep '@smoke'",
     "ctest": "playwright test --config=tests/library/playwright.config.ts --project=chromium",
     "ftest": "playwright test --config=tests/library/playwright.config.ts --project=firefox",
     "wtest": "playwright test --config=tests/library/playwright.config.ts --project=webkit",
diff --git a/packages/html-reporter/playwright.config.ts b/packages/html-reporter/playwright.config.ts
index 1bcc519b4a..ff7fe98778 100644
--- a/packages/html-reporter/playwright.config.ts
+++ b/packages/html-reporter/playwright.config.ts
@@ -22,6 +22,7 @@ const config: PlaywrightTestConfig = {
   forbidOnly: !!process.env.CI,
   retries: process.env.CI ? 2 : 0,
   ignoreSnapshots: !process.env.PLAYWRIGHT_DOCKER,
+  snapshotPathTemplate: '{testDir}/__screenshots__/{projectName}/{testFilePath}/{arg}{ext}',
   reporter: 'html',
   use: {
     ctPort: 3101,
diff --git a/tests/playwright-test/snapshot-path-template.spec.ts b/tests/playwright-test/snapshot-path-template.spec.ts
index fc69fc36ea..c54993498d 100644
--- a/tests/playwright-test/snapshot-path-template.spec.ts
+++ b/tests/playwright-test/snapshot-path-template.spec.ts
@@ -45,6 +45,7 @@ async function getSnapshotPaths(runInlineTest, testInfo, playwrightConfig, pathA
 }
 
 test('tokens should expand property', async ({ runInlineTest }, testInfo) => {
+  test.slow();
   const snapshotPath = await getSnapshotPaths(runInlineTest, testInfo, {
     projects: [{
       name: 'proj1',