Fix bug with allowing external websites and update test

revisit-studies · Oct 7, 2024 · ba8434a · ba8434a
1 parent 949297c
commit ba8434a
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/public/demo-html/config.json b/public/demo-html/config.json
@@ -50,13 +50,19 @@
           "max": 7
         }
       ]
+    },
+    "external_website": {
+      "type": "website",
+      "path": "https://www.revisit.dev",
+      "response": []
     }
   },
   "sequence": {
     "order": "fixed",
     "components": [
       "introduction",
-      "barChart"
+      "barChart",
+      "external_website"
     ]
   }
 }
diff --git a/src/controllers/IframeController.tsx b/src/controllers/IframeController.tsx
@@ -82,7 +82,11 @@ export default function IframeController({ currentConfig }: { currentConfig: Web
   return (
     <iframe
       ref={ref}
-      src={`${BASE_PREFIX}${currentConfig.path}?trialid=${currentComponent}&id=${iframeId}`}
+      src={
+        currentConfig.path.startsWith('http')
+          ? currentConfig.path
+          : `${BASE_PREFIX}${currentConfig.path}?trialid=${currentComponent}&id=${iframeId}`
+      }
       style={defaultStyle}
     />
   );

diff --git a/tests/demo-html.spec.ts b/tests/demo-html.spec.ts
@@ -29,6 +29,11 @@ test('html demo works as intended', async ({ page }) => {
   // Click on the next button
   await page.getByRole('button', { name: 'Next', exact: true }).click();
 
+  const iframeContent = await page.frameLocator('iframe').getByRole('link', { name: 'Try The Demo' });
+  await expect(iframeContent).toBeVisible();
+
+  await page.getByRole('button', { name: 'Next', exact: true }).click();
+
   // Check that the end of study text renders
   const endText = await page.getByText('Please wait while your answers are uploaded.');
   await expect(endText).toBeVisible();