stuff

OHIF · Dec 4, 2024 · b88b87b · b88b87b
1 parent 58b06eb
commit b88b87b
Show file tree

Hide file tree

Showing 6 changed files with 57 additions and 8 deletions.
diff --git a/tests/3DFourUp.spec.ts b/tests/3DFourUp.spec.ts
@@ -1,5 +1,11 @@
 import { test } from '@playwright/test';
-import { visitStudy, checkForScreenshot, screenShotPaths, reduce3DViewportSize } from './utils';
+import {
+  visitStudy,
+  checkForScreenshot,
+  screenShotPaths,
+  reduce3DViewportSize,
+  attemptAction,
+} from './utils';
 
 test.beforeEach(async ({ page }) => {
   const studyInstanceUID = '1.3.6.1.4.1.14519.5.2.1.1706.8374.643249677828306008300337414785';
@@ -15,7 +21,9 @@ test.describe('3D four up Test', async () => {
       .filter({ hasText: /^3D four up$/ })
       .first()
       .click();
-    await reduce3DViewportSize(page);
+
+    await attemptAction(() => reduce3DViewportSize(page), 10, 100);
+
     await checkForScreenshot(
       page,
       page,

diff --git a/tests/3DMain.spec.ts b/tests/3DMain.spec.ts
@@ -1,5 +1,11 @@
 import { test } from '@playwright/test';
-import { visitStudy, checkForScreenshot, screenShotPaths, reduce3DViewportSize } from './utils';
+import {
+  visitStudy,
+  checkForScreenshot,
+  screenShotPaths,
+  reduce3DViewportSize,
+  attemptAction,
+} from './utils';
 
 test.beforeEach(async ({ page }) => {
   const studyInstanceUID = '1.3.6.1.4.1.14519.5.2.1.1706.8374.643249677828306008300337414785';
@@ -15,7 +21,7 @@ test.describe('3D main Test', async () => {
       .filter({ hasText: /^3D main$/ })
       .first()
       .click();
-    await reduce3DViewportSize(page);
+    await attemptAction(() => reduce3DViewportSize(page), 10, 100);
     await checkForScreenshot(
       page,
       page,

diff --git a/tests/3DOnly.spec.ts b/tests/3DOnly.spec.ts
@@ -1,5 +1,11 @@
 import { test } from '@playwright/test';
-import { visitStudy, checkForScreenshot, screenShotPaths, reduce3DViewportSize } from './utils';
+import {
+  visitStudy,
+  checkForScreenshot,
+  screenShotPaths,
+  reduce3DViewportSize,
+  attemptAction,
+} from './utils';
 
 test.beforeEach(async ({ page }) => {
   const studyInstanceUID = '1.3.6.1.4.1.14519.5.2.1.1706.8374.643249677828306008300337414785';
@@ -15,7 +21,7 @@ test.describe('3D only Test', async () => {
       .filter({ hasText: /^3D only$/ })
       .first()
       .click();
-    await reduce3DViewportSize(page);
+    await attemptAction(() => reduce3DViewportSize(page), 10, 100);
     await checkForScreenshot(
       page,
       page,

diff --git a/tests/3DPrimary.spec.ts b/tests/3DPrimary.spec.ts
@@ -1,5 +1,11 @@
 import { test } from '@playwright/test';
-import { visitStudy, checkForScreenshot, screenShotPaths, reduce3DViewportSize } from './utils';
+import {
+  visitStudy,
+  checkForScreenshot,
+  screenShotPaths,
+  reduce3DViewportSize,
+  attemptAction,
+} from './utils';
 
 test.beforeEach(async ({ page }) => {
   const studyInstanceUID = '1.3.6.1.4.1.14519.5.2.1.1706.8374.643249677828306008300337414785';
@@ -16,7 +22,7 @@ test.describe('3D primary Test', async () => {
       .first()
       .click();
 
-    await reduce3DViewportSize(page);
+    await attemptAction(() => reduce3DViewportSize(page), 10, 100);
     await checkForScreenshot(
       page,
       page,

diff --git a/tests/utils/attemptAction.ts b/tests/utils/attemptAction.ts
@@ -0,0 +1,21 @@
+/**
+ *
+ * @param action  The action function to attempt
+ * @param attempts  The number of attempts to try the action
+ * @param delay delay between attempts
+ * @returns True if the action is successful, otherwise throws an error
+ */
+
+export const attemptAction = async (action: () => Promise<void>, attempts = 10, delay = 100) => {
+  for (let i = 1; i < attempts; i++) {
+    try {
+      await action();
+      return true;
+    } catch (error) {
+      if (i === attempts) {
+        throw new Error('Action failed.');
+      }
+      await new Promise(resolve => setTimeout(resolve, delay));
+    }
+  }
+};
diff --git a/tests/utils/index.ts b/tests/utils/index.ts
@@ -8,6 +8,7 @@ import { getSUV } from './getSUV';
 import { getTMTVModalityUnit } from './getTMTVModalityUnit';
 import { clearAllAnnotations } from './clearAllAnnotations';
 import { scrollVolumeViewport } from './scrollVolumeViewport';
+import { attemptAction } from './attemptAction';
 
 export {
   visitStudy,
@@ -21,4 +22,5 @@ export {
   getTMTVModalityUnit,
   clearAllAnnotations,
   scrollVolumeViewport,
+  attemptAction,
 };