Merge branch 'release/1.18' into staging

TouK · Nov 21, 2024 · a68f84c · a68f84c
2 parents 0d6a9c7 + 00fd152
commit a68f84c
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 1 deletion.
diff --git a/.../__image_snapshots__/electron/Linux/Activities should display activities #0.png b/.../__image_snapshots__/electron/Linux/Activities should display activities #0.png
diff --git a/.../__image_snapshots__/electron/Linux/Activities should display activities #1.png b/.../__image_snapshots__/electron/Linux/Activities should display activities #1.png
diff --git a/.../__image_snapshots__/electron/Linux/Activities should display activities #2.png b/.../__image_snapshots__/electron/Linux/Activities should display activities #2.png
diff --git a/.../__image_snapshots__/electron/Linux/Activities should display activities #3.png b/.../__image_snapshots__/electron/Linux/Activities should display activities #3.png
diff --git a/designer/client/cypress/e2e/activities.cy.ts b/designer/client/cypress/e2e/activities.cy.ts
@@ -25,7 +25,7 @@ const makeScreenshot = () => {
     cy.get('[data-testid="activities-panel"]').matchImage({
         maxDiffThreshold: 0.01,
         screenshotConfig: {
-            blackout: ["[data-testid='activity-date']"],
+            blackout: [":has(>[data-testid='activity-date'])"],
         },
     });
 };