Fix e2e tests

aehrc · Jun 20, 2024 · 53999d4 · 53999d4
1 parent e51ea0d
commit 53999d4
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 8 deletions.
diff --git a/apps/smart-forms-app/e2e/_pre-run.spec.ts b/apps/smart-forms-app/e2e/_pre-run.spec.ts
@@ -17,7 +17,7 @@
 
 import { expect, test } from '@playwright/test';
 import {
-  LAUNCH_PARAM,
+  LAUNCH_PARAM_WITHOUT_Q,
   PLAYWRIGHT_APP_URL,
   PLAYWRIGHT_EHR_URL,
   PLAYWRIGHT_FORMS_SERVER_URL
@@ -31,7 +31,7 @@ test('launch without questionnaire context, select a questionnaire and create a
     `${PLAYWRIGHT_FORMS_SERVER_URL}/Questionnaire?_count=100&_sort=-date&`
   );
 
-  const launchUrl = `${PLAYWRIGHT_APP_URL}/launch?iss=https%3A%2F%2Fproxy.smartforms.io%2Fv%2Fr4%2Ffhir&launch=${LAUNCH_PARAM}`;
+  const launchUrl = `${PLAYWRIGHT_APP_URL}/launch?iss=https%3A%2F%2Fproxy.smartforms.io%2Fv%2Fr4%2Ffhir&launch=${LAUNCH_PARAM_WITHOUT_Q}`;
   await page.goto(launchUrl);
   expect((await fetchQPromise).status()).toBe(200);
 

diff --git a/apps/smart-forms-app/e2e/dashboard.spec.ts b/apps/smart-forms-app/e2e/dashboard.spec.ts
@@ -16,7 +16,7 @@
  */
 
 import { expect, test } from '@playwright/test';
-import { LAUNCH_PARAM, PLAYWRIGHT_APP_URL, PLAYWRIGHT_FORMS_SERVER_URL } from './globals';
+import { LAUNCH_PARAM_WITHOUT_Q, PLAYWRIGHT_APP_URL, PLAYWRIGHT_FORMS_SERVER_URL } from './globals';
 
 const questionnaireTitle = 'Aboriginal and Torres Strait Islander Health Check';
 
@@ -25,7 +25,7 @@ test.beforeEach(async ({ page }) => {
   const fetchQPromise = page.waitForResponse(
     `${PLAYWRIGHT_FORMS_SERVER_URL}/Questionnaire?_count=100&_sort=-date&`
   );
-  const launchUrl = `${PLAYWRIGHT_APP_URL}/launch?iss=https%3A%2F%2Fproxy.smartforms.io%2Fv%2Fr4%2Ffhir&launch=${LAUNCH_PARAM}`;
+  const launchUrl = `${PLAYWRIGHT_APP_URL}/launch?iss=https%3A%2F%2Fproxy.smartforms.io%2Fv%2Fr4%2Ffhir&launch=${LAUNCH_PARAM_WITHOUT_Q}`;
   await page.goto(launchUrl);
   expect((await fetchQPromise).status()).toBe(200);
 

diff --git a/apps/smart-forms-app/e2e/globals.ts b/apps/smart-forms-app/e2e/globals.ts
@@ -22,6 +22,10 @@ export const PLAYWRIGHT_APP_URL = process.env.CI
   ? 'http://localhost:4173'
   : 'http://localhost:5173';
 
-export const LAUNCH_PARAM = process.env.CI
+export const LAUNCH_PARAM_WITHOUT_Q = process.env.CI
   ? 'WzAsInBhdC1zZiIsInByaW1hcnktcGV0ZXIiLCJBVVRPIiwwLDAsMCwiZmhpclVzZXIgb25saW5lX2FjY2VzcyBvcGVuaWQgcHJvZmlsZSBwYXRpZW50L0NvbmRpdGlvbi5ycyBwYXRpZW50L09ic2VydmF0aW9uLnJzIGxhdW5jaCBwYXRpZW50L0VuY291bnRlci5ycyBwYXRpZW50L1F1ZXN0aW9ubmFpcmVSZXNwb25zZS5jcnVkcyBwYXRpZW50L1BhdGllbnQucnMiLCJodHRwOi8vbG9jYWxob3N0OjQxNzMvIiwiYTU3ZDkwZTMtNWY2OS00YjkyLWFhMmUtMjk5MjE4MDg2M2MxIiwiIiwiIiwiIiwiIiwwLDEsIiIsZmFsc2Vd'
   : 'WzAsInBhdC1zZiIsInByaW1hcnktcGV0ZXIiLCJBVVRPIiwwLDAsMCwiZmhpclVzZXIgb25saW5lX2FjY2VzcyBvcGVuaWQgcHJvZmlsZSBwYXRpZW50L0NvbmRpdGlvbi5ycyBwYXRpZW50L09ic2VydmF0aW9uLnJzIGxhdW5jaCBwYXRpZW50L0VuY291bnRlci5ycyBwYXRpZW50L1F1ZXN0aW9ubmFpcmVSZXNwb25zZS5jcnVkcyBwYXRpZW50L1BhdGllbnQucnMiLCJodHRwOi8vbG9jYWxob3N0OjUxNzMvIiwiMWZmN2JkYzItMzZiMi00MzAzLThjMDUtYzU3MzQyYzViMDQzIiwiIiwiIiwiIiwiIiwwLDEsIiIsZmFsc2Vd';
+
+export const LAUNCH_PARAM_WITH_Q = process.env.CI
+  ? 'WzAsInBhdC1zZiIsInByaW1hcnktcGV0ZXIiLCJBVVRPIiwwLDAsMCwiZmhpclVzZXIgb25saW5lX2FjY2VzcyBvcGVuaWQgcHJvZmlsZSBwYXRpZW50L0NvbmRpdGlvbi5ycyBwYXRpZW50L09ic2VydmF0aW9uLnJzIGxhdW5jaCBwYXRpZW50L0VuY291bnRlci5ycyBwYXRpZW50L1F1ZXN0aW9ubmFpcmVSZXNwb25zZS5jcnVkcyBwYXRpZW50L1BhdGllbnQucnMiLCJodHRwOi8vbG9jYWxob3N0OjQxNzMvIiwiYTU3ZDkwZTMtNWY2OS00YjkyLWFhMmUtMjk5MjE4MDg2M2MxIiwiIiwiIiwiIiwiIiwwLDEsIntcInJvbGVcIjpcInF1ZXN0aW9ubmFpcmUtcmVuZGVyLW9uLWxhdW5jaFwiLFwiY2Fub25pY2FsXCI6XCJodHRwOi8vd3d3LmhlYWx0aC5nb3YuYXUvYXNzZXNzbWVudHMvbWJzLzcxNXwwLjEuMC1hc3NlbWJsZWRcIixcInR5cGVcIjpcIlF1ZXN0aW9ubmFpcmVcIn0iLGZhbHNlXQ'
+  : 'WzAsInBhdC1zZiIsInByaW1hcnktcGV0ZXIiLCJBVVRPIiwwLDAsMCwiZmhpclVzZXIgb25saW5lX2FjY2VzcyBvcGVuaWQgcHJvZmlsZSBwYXRpZW50L0NvbmRpdGlvbi5ycyBwYXRpZW50L09ic2VydmF0aW9uLnJzIGxhdW5jaCBwYXRpZW50L0VuY291bnRlci5ycyBwYXRpZW50L1F1ZXN0aW9ubmFpcmVSZXNwb25zZS5jcnVkcyBwYXRpZW50L1BhdGllbnQucnMiLCJodHRwOi8vbG9jYWxob3N0OjUxNzMvIiwiMWZmN2JkYzItMzZiMi00MzAzLThjMDUtYzU3MzQyYzViMDQzIiwiIiwiIiwiIiwiIiwwLDEsIntcInJvbGVcIjpcInF1ZXN0aW9ubmFpcmUtcmVuZGVyLW9uLWxhdW5jaFwiLFwiY2Fub25pY2FsXCI6XCJodHRwOi8vd3d3LmhlYWx0aC5nb3YuYXUvYXNzZXNzbWVudHMvbWJzLzcxNXwwLjEuMC1hc3NlbWJsZWRcIixcInR5cGVcIjpcIlF1ZXN0aW9ubmFpcmVcIn0iLGZhbHNlXQ';
diff --git a/apps/smart-forms-app/e2e/saving.spec.ts b/apps/smart-forms-app/e2e/saving.spec.ts
@@ -16,7 +16,7 @@
  */
 
 import { expect, test } from '@playwright/test';
-import { LAUNCH_PARAM, PLAYWRIGHT_APP_URL, PLAYWRIGHT_EHR_URL } from './globals';
+import { LAUNCH_PARAM_WITH_Q, PLAYWRIGHT_APP_URL, PLAYWRIGHT_EHR_URL } from './globals';
 
 const questionnaireTitle = 'Aboriginal and Torres Strait Islander Health Check';
 
@@ -25,7 +25,7 @@ test.beforeEach(async ({ page }) => {
   const populatePromise = page.waitForResponse(
     new RegExp(/^https:\/\/proxy\.smartforms\.io\/v\/r4\/fhir\/(Observation|Condition)\?.+$/)
   );
-  const launchUrl = `${PLAYWRIGHT_APP_URL}/launch?iss=https%3A%2F%2Fproxy.smartforms.io%2Fv%2Fr4%2Ffhir&launch=${LAUNCH_PARAM}`;
+  const launchUrl = `${PLAYWRIGHT_APP_URL}/launch?iss=https%3A%2F%2Fproxy.smartforms.io%2Fv%2Fr4%2Ffhir&launch=${LAUNCH_PARAM_WITH_Q}`;
   await page.goto(launchUrl);
   const populateResponse = await populatePromise;
   expect(populateResponse.status()).toBe(200);

diff --git a/...pp/src/features/renderer/components/RendererNav/RendererNavLaunchQuestionnaireActions.tsx b/...pp/src/features/renderer/components/RendererNav/RendererNavLaunchQuestionnaireActions.tsx
@@ -66,7 +66,6 @@ function RendererNavLaunchQuestionnaireActions(props: RendererNavLaunchQuestionn
               <SaveProgressAction refetchResponses={refetchResponses} />
               <SaveAsFinalAction />
               <RepopulateAction spinner={spinner} onSpinnerChange={onSpinnerChange} />
-              <SaveAsFinalAction />
             </>
           ) : null}
         </List>