test: Requested changes

Author: harshthakkr

e2e/commands/patient-operations.ts

@@ -1,48 +1,12 @@
 import { type APIRequestContext, expect } from '@playwright/test';
-
-export interface Patient {
-  uuid: string;
-  identifiers: Identifier[];
-  display: string;
-  person: {
-    uuid: string;
-    display: string;
-    gender: string;
-    age: number;
-    birthdate: string;
-    birthdateEstimated: boolean;
-    dead: boolean;
-    deathDate?: string;
-    causeOfDeath?: string;
-    preferredAddress: {
-      address1: string;
-      cityVillage: string;
-      country: string;
-      postalCode: string;
-      stateProvince: string;
-      countyDistrict: string;
-    };
-    attributes: Array<Record<string, unknown>>;
-    voided: boolean;
-    birthtime?: string;
-    deathdateEstimated: boolean;
-    resourceVersion: string;
-  };
-  attributes: { value: string; attributeType: { uuid: string; display: string } }[];
-  voided: boolean;
-}
-
-export interface Identifier {
-  uuid: string;
-  display: string;
-}
+import type { Patient } from '../types';
 
 export const generateRandomPatient = async (api: APIRequestContext): Promise<Patient> => {
   const identifierRes = await api.post('idgen/identifiersource/8549f706-7e85-4c1d-9424-217d50a2988b/identifier', {
     data: {},
   });
   await expect(identifierRes.ok()).toBeTruthy();
-  
+
   const { identifier } = await identifierRes.json();
 
   const patientRes = await api.post('patient', {

e2e/pages/home-page.ts

@@ -2,6 +2,7 @@ import { type Page } from '@playwright/test';
 
 export class HomePage {
   constructor(readonly page: Page) {}
+  readonly helpButton = () => this.page.locator('button[aria-controls="help-menu-popup"]');
   readonly nextButton = () => this.page.getByRole('button', { name: 'Next', exact: true });
   readonly finishButton = () => this.page.getByRole('button', { name: 'Last' });
 

e2e/specs/basic-overview.spec.ts

@@ -10,10 +10,7 @@ test('Basic overview tutorial', async ({ page }) => {
   });
 
   await test.step('And I click the `Help` button', async () => {
-    await page
-      .locator('[id="single-spa-application\\:\\@openmrs\\/esm-help-menu-app-page-0"]')
-      .getByRole('button')
-      .click();
+    await homePage.helpButton().click();
   });
 
   await test.step('And I click the `Tutorials` button', async () => {
@@ -44,7 +41,7 @@ test('Basic overview tutorial', async ({ page }) => {
   });
 
   await test.step('And I click the `Next` button', async () => {
-    await homePage.nextButton().click({ force: true });
+    await homePage.nextButton().click();
   });
 
   await test.step('Then I should see the second tooltip', async () => {

e2e/specs/demo-tutorial.spec.ts

@@ -10,10 +10,7 @@ test('Demo tutorial', async ({ page }) => {
   });
 
   await test.step('And I click the `Help` button', async () => {
-    await page
-      .locator('[id="single-spa-application\\:\\@openmrs\\/esm-help-menu-app-page-0"]')
-      .getByRole('button')
-      .click();
+    await homePage.helpButton().click();
   });
 
   await test.step('And I click the `Tutorials` button', async () => {

e2e/specs/find-patient.spec.ts

@@ -18,10 +18,7 @@ test('Finding a patient tutorial', async ({ page }) => {
   });
 
   await test.step('And I click the `Help` button', async () => {
-    await page
-      .locator('[id="single-spa-application\\:\\@openmrs\\/esm-help-menu-app-page-0"]')
-      .getByRole('button')
-      .click();
+    await homePage.helpButton().click();
   });
 
   await test.step('And I click the `Tutorials` button', async () => {

e2e/specs/patient-chart.spec.ts

@@ -18,10 +18,7 @@ test('Patient chart tutorial', async ({ page }) => {
   });
 
   await test.step('And I click the `Help` button', async () => {
-    await page
-      .locator('[id="single-spa-application\\:\\@openmrs\\/esm-help-menu-app-page-0"]')
-      .getByRole('button')
-      .click();
+    await homePage.helpButton().click();
   });
 
   await test.step('And I click the `Tutorials` button', async () => {

e2e/specs/record-vitals.spec.ts

@@ -1,6 +1,7 @@
 import { expect } from '@playwright/test';
 import { type Visit } from '@openmrs/esm-framework';
-import { generateRandomPatient, deletePatient, type Patient, startVisit, endVisit } from '../commands';
+import { generateRandomPatient, deletePatient, startVisit, endVisit } from '../commands';
+import { type Patient } from '../types';
 import { HomePage } from '../pages';
 import { test } from '../core';
 
@@ -20,10 +21,7 @@ test('Recording vitals tutorial', async ({ page }) => {
   });
 
   await test.step('And I click the `Help` button', async () => {
-    await page
-      .locator('[id="single-spa-application\\:\\@openmrs\\/esm-help-menu-app-page-0"]')
-      .getByRole('button')
-      .click();
+    await homePage.helpButton().click();
   });
 
   await test.step('And I click the `Tutorials` button', async () => {
@@ -97,31 +95,13 @@ test('Recording vitals tutorial', async ({ page }) => {
     await expect(page.getByRole('heading', { name: /vitals form/i, level: 4 })).toBeVisible();
   });
 
-  await test.step('When I fill `37` as the temperature', async () => {
+  await test.step('And I fill in the Vitals form', async () => {
     await page.getByRole('spinbutton', { name: /temperature/i }).fill('37');
-  });
-
-  await test.step('And I fill `120` as the systolic', async () => {
     await page.getByRole('spinbutton', { name: /systolic/i }).fill('120');
-  });
-
-  await test.step('And I fill `100` as the diastolic', async () => {
     await page.getByRole('spinbutton', { name: /diastolic/i }).fill('100');
-  });
-
-  await test.step('And I fill `65` as the pulse', async () => {
     await page.getByRole('spinbutton', { name: /pulse/i }).fill('65');
-  });
-
-  await test.step('And I fill `16` as the respiration rate', async () => {
     await page.getByRole('spinbutton', { name: /respiration rate/i }).fill('16');
-  });
-
-  await test.step('And I fill `98` as the oxygen saturation', async () => {
     await page.getByRole('spinbutton', { name: /oxygen saturation/i }).fill('98');
-  });
-
-  await test.step('And I add additional notes', async () => {
     await page.getByPlaceholder(/type any additional notes here/i).fill('Test notes');
   });
 

e2e/specs/register-patient.spec.ts

@@ -10,10 +10,7 @@ test('Registering a patient tutorial', async ({ page }) => {
   });
 
   await test.step('And I click the `Help` button', async () => {
-    await page
-      .locator('[id="single-spa-application\\:\\@openmrs\\/esm-help-menu-app-page-0"]')
-      .getByRole('button')
-      .click();
+    await homePage.helpButton().click();
   });
 
   await test.step('And I click the `Tutorials` button', async () => {

e2e/specs/start-patient-visit.spec.ts

@@ -18,10 +18,7 @@ test('Starting a patient visit tutorial', async ({ page }) => {
   });
 
   await test.step('And I click the `Help` button', async () => {
-    await page
-      .locator('[id="single-spa-application\\:\\@openmrs\\/esm-help-menu-app-page-0"]')
-      .getByRole('button')
-      .click();
+    await homePage.helpButton().click();
   });
 
   await test.step('And I click the `Tutorials` button', async () => {

package.json

@@ -53,9 +53,9 @@
     "rxjs": "6.x"
   },
   "devDependencies": {
-    "@openmrs/esm-framework": "^6.2.1-pre.2752",
+    "@openmrs/esm-framework": "next",
     "@openmrs/esm-styleguide": "next",
-    "@playwright/test": "1.44.0",
+    "@playwright/test": "^1.50.1",
     "@swc/cli": "^0.3.12",
     "@swc/core": "^1.3.68",
     "@swc/jest": "^0.2.36",