chore: fix everything after merging release in

AmazeeLabs · Dec 17, 2024 · cdc33a4 · cdc33a4
1 parent dfddf40
commit cdc33a4
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 111 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -84,12 +84,9 @@ jobs:
           playwright: true
           projectToken: ${{ secrets.CHROMATIC_PLAYWRIGHT_PROJECT_TOKEN }}
           workingDir: tests/e2e/
-        env:
-          CHROMATIC_ARCHIVE_LOCATION: ./test-results-drupal
         if:
-          ${{steps.chromatic-playwright-check.outputs.available == 'true' &&
-          hashFiles('tests/e2e/test-results-drupal') != '' && (success() ||
-          failure()) }}
+          always() && hashFiles('tests/e2e/test-results') &&
+          steps.chromatic-playwright-check.outputs.available == 'true'
 
       - name: Publish Storybook to Chromatic
         id: chromatic-storybook

diff --git a/packages/webform-export/specs/webforms.spec.ts b/packages/webform-export/specs/webforms.spec.ts
@@ -1,6 +1,5 @@
 import { saveWebpage } from '@amazeelabs/save-webpage';
-import { expect, test } from '@chromatic-com/playwright';
-import { Page } from '@playwright/test';
+import { expect, Page, test } from '@playwright/test';
 import { execSync } from 'child_process';
 
 const baseDir = '../ui/static/stories/webforms';

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/tests/e2e/.gitignore b/tests/e2e/.gitignore
@@ -1,8 +1,5 @@
 node_modules/
 /test-results/
-/test-results-drupal/
-/test-results-decap/
-/test-results-webform-snapshots/
 /playwright-report/
 /playwright/.cache/
 .auth

diff --git a/tests/e2e/playwright.config.ts b/tests/e2e/playwright.config.ts
@@ -1,16 +1,22 @@
+import { ChromaticConfig } from '@chromatic-com/playwright';
 import { defineConfig, devices } from '@playwright/test';
 
-export default defineConfig({
+export default defineConfig<ChromaticConfig>({
   fullyParallel: true,
   retries: process.env.CI ? 2 : 0,
   workers: 1,
   reporter: 'html',
   use: {
     trace: process.env.CI ? 'retain-on-failure' : 'on',
     actionTimeout: 10_000,
+    ignoreSelectors: [
+      // Ignore the following selectors in the visual regression tests
+      // these contain dynamic content that changes on every page load
+      'div#edit-meta-changed',
+      'article.profile > .form-item',
+    ],
   },
   testDir: './specs',
-  outputDir: './test-results-drupal',
   webServer: [
     {
       command: 'pnpm run --filter "@custom/cms" start >> /tmp/cms.log 2>&1',

diff --git a/tests/e2e/specs/drupal/blocks.spec.ts b/tests/e2e/specs/drupal/blocks.spec.ts
@@ -1,4 +1,5 @@
-import { expect, Page, test } from '@chromatic-com/playwright';
+import { expect, test } from '@chromatic-com/playwright';
+import { Page } from '@playwright/test';
 
 import { websiteUrl } from '../../helpers/url';