Fix outdated playwright snapshot directory (#40422)

* Revert "Revert "Move Playwright snapshots into the same local folder (#40336)" (#40412)" This reverts commit 33a5d51. * Fix outdated snapshot directory
WordPress · Apr 18, 2022 · d6387d7 · d6387d7
1 parent fad579f
commit d6387d7
Show file tree

Hide file tree

Showing 27 changed files with 13 additions and 5 deletions.
diff --git a/packages/e2e-test-utils-playwright/src/test.ts b/packages/e2e-test-utils-playwright/src/test.ts
@@ -99,7 +99,7 @@ function observeConsoleLogging( message: ConsoleMessage ) {
 const test = base.extend<
  {
  pageUtils: PageUtils;
- snapshotSuffix: void;
+ snapshotConfig: void;
  },
  {
  requestUtils: RequestUtils;
@@ -137,11 +137,19 @@ const test = base.extend<
  },
  { scope: 'worker' },
  ],
- // A work-around automatic fixture to remove the default snapshot suffix.
- // See https://github.com/microsoft/playwright/issues/11134
- snapshotSuffix: [
+ // An automatic fixture to configure snapshot settings globally.
+ snapshotConfig: [
  async ( {}, use, testInfo ) => {
+ // A work-around to remove the default snapshot suffix.
+ // See https://github.com/microsoft/playwright/issues/11134
  testInfo.snapshotSuffix = '';
+ // Normalize snapshots into the same `__snapshots__` folder to minimize
+ // the file name length on Windows.
+ // See https://github.com/WordPress/gutenberg/issues/40291
+ testInfo.snapshotDir = path.join(
+ path.dirname( testInfo.file ),
+ '__snapshots__'
+ );
 
  await use();
  },

diff --git a/...xtual-element-image-spacer-1-chromium.txt → ...xtual-element-image-spacer-1-chromium.txt b/...xtual-element-image-spacer-1-chromium.txt → ...xtual-element-image-spacer-1-chromium.txt
diff --git a/...s-with-collapsed-selection-1-chromium.txt → ...s-with-collapsed-selection-1-chromium.txt b/...s-with-collapsed-selection-1-chromium.txt → ...s-with-collapsed-selection-1-chromium.txt
diff --git a/...s-with-collapsed-selection-2-chromium.txt → ...s-with-collapsed-selection-2-chromium.txt b/...s-with-collapsed-selection-2-chromium.txt → ...s-with-collapsed-selection-2-chromium.txt
diff --git a/...s-are-focused-image-spacer-1-chromium.txt → ...s-are-focused-image-spacer-1-chromium.txt b/...s-are-focused-image-spacer-1-chromium.txt → ...s-are-focused-image-spacer-1-chromium.txt
diff --git a/...s-are-focused-image-spacer-2-chromium.txt → ...s-are-focused-image-spacer-2-chromium.txt b/...s-are-focused-image-spacer-2-chromium.txt → ...s-are-focused-image-spacer-2-chromium.txt
diff --git a/...l-selection-of-text-blocks-1-chromium.txt → ...l-selection-of-text-blocks-1-chromium.txt b/...l-selection-of-text-blocks-1-chromium.txt → ...l-selection-of-text-blocks-1-chromium.txt
diff --git a/...l-selection-of-text-blocks-2-chromium.txt → ...l-selection-of-text-blocks-2-chromium.txt b/...l-selection-of-text-blocks-2-chromium.txt → ...l-selection-of-text-blocks-2-chromium.txt
diff --git a/...th-other-blocks-in-between-1-chromium.txt → ...th-other-blocks-in-between-1-chromium.txt b/...th-other-blocks-in-between-1-chromium.txt → ...th-other-blocks-in-between-1-chromium.txt
diff --git a/...th-other-blocks-in-between-2-chromium.txt → ...th-other-blocks-in-between-2-chromium.txt b/...th-other-blocks-in-between-2-chromium.txt → ...th-other-blocks-in-between-2-chromium.txt
diff --git a/...s-with-collapsed-selection-1-chromium.txt → ...s-with-collapsed-selection-1-chromium.txt b/...s-with-collapsed-selection-1-chromium.txt → ...s-with-collapsed-selection-1-chromium.txt
diff --git a/...s-with-collapsed-selection-2-chromium.txt → ...s-with-collapsed-selection-2-chromium.txt b/...s-with-collapsed-selection-2-chromium.txt → ...s-with-collapsed-selection-2-chromium.txt
diff --git a/...ividual-non-textual-blocks-2-chromium.txt → ...ividual-non-textual-blocks-1-chromium.txt b/...ividual-non-textual-blocks-2-chromium.txt → ...ividual-non-textual-blocks-1-chromium.txt
diff --git a/...ormal-delete---not-forward-1-chromium.txt → ...ormal-delete---not-forward-1-chromium.txt b/...ormal-delete---not-forward-1-chromium.txt → ...ormal-delete---not-forward-1-chromium.txt
diff --git a/...ormal-delete---not-forward-2-chromium.txt → ...ormal-delete---not-forward-2-chromium.txt b/...ormal-delete---not-forward-2-chromium.txt → ...ormal-delete---not-forward-2-chromium.txt
diff --git a/...l-selection-of-text-blocks-1-chromium.txt → ...l-selection-of-text-blocks-1-chromium.txt b/...l-selection-of-text-blocks-1-chromium.txt → ...l-selection-of-text-blocks-1-chromium.txt
diff --git a/...l-selection-of-text-blocks-2-chromium.txt → ...l-selection-of-text-blocks-2-chromium.txt b/...l-selection-of-text-blocks-2-chromium.txt → ...l-selection-of-text-blocks-2-chromium.txt
diff --git a/...th-other-blocks-in-between-1-chromium.txt → ...th-other-blocks-in-between-1-chromium.txt b/...th-other-blocks-in-between-1-chromium.txt → ...th-other-blocks-in-between-1-chromium.txt
diff --git a/...th-other-blocks-in-between-2-chromium.txt → ...th-other-blocks-in-between-2-chromium.txt b/...th-other-blocks-in-between-2-chromium.txt → ...th-other-blocks-in-between-2-chromium.txt
diff --git a/...d-handle-paste-events-once-1-chromium.txt → ...d-handle-paste-events-once-1-chromium.txt b/...d-handle-paste-events-once-1-chromium.txt → ...d-handle-paste-events-once-1-chromium.txt
diff --git a/...input-fields-and-textareas-1-chromium.txt → ...input-fields-and-textareas-1-chromium.txt b/...input-fields-and-textareas-1-chromium.txt → ...input-fields-and-textareas-1-chromium.txt
diff --git a/...input-fields-and-textareas-2-chromium.txt → ...input-fields-and-textareas-2-chromium.txt b/...input-fields-and-textareas-2-chromium.txt → ...input-fields-and-textareas-2-chromium.txt
diff --git a/...copy-when-text-is-selected-1-chromium.txt → ...copy-when-text-is-selected-1-chromium.txt b/...copy-when-text-is-selected-1-chromium.txt → ...copy-when-text-is-selected-1-chromium.txt
diff --git a/...copy-when-text-is-selected-2-chromium.txt → ...copy-when-text-is-selected-2-chromium.txt b/...copy-when-text-is-selected-2-chromium.txt → ...copy-when-text-is-selected-2-chromium.txt
diff --git a/...emplates-in-classic-themes-1-chromium.txt → ...emplates-in-classic-themes-1-chromium.txt b/...emplates-in-classic-themes-1-chromium.txt → ...emplates-in-classic-themes-1-chromium.txt
diff --git a/test/e2e/specs/editor/various/copy-cut-paste.spec.js b/test/e2e/specs/editor/various/copy-cut-paste.spec.js
@@ -68,7 +68,7 @@ test.describe( 'Copy/cut/paste', () => {
  await pageUtils.insertBlock( { name: 'core/spacer' } );
  // At this point the spacer wrapper should be focused.
  await pageUtils.pressKeyWithModifier( 'primary', 'x' );
- expect( await pageUtils.getEditedPostContent() ).toMatchSnapshot();
+ expect( await pageUtils.getEditedPostContent() ).toBe( '' );
 
  // The block appender is only visible when there's no selection.
  await page.evaluate( () => {

diff --git a/...napshots/Copy-cut-paste-should-cut-and-paste-individual-non-textual-blocks-1-chromium.txt b/...napshots/Copy-cut-paste-should-cut-and-paste-individual-non-textual-blocks-1-chromium.txt