C2C-355: E2E tests for the observation forms

e2e/tests/diagnosis.spec.ts

@@ -9,9 +9,8 @@ test.beforeEach(async ({ page }) => {
 
   await bahmni.login();
   await expect(page.getByText(/registration/i)).toBeVisible();
-  await expect(page.getByText(/linical/i)).toBeVisible();
+  await expect(page.getByText(/clinical/i)).toBeVisible();
   await expect(page.getByText(/admin/i)).toBeVisible();
-  await expect(page.getByText(/appointment scheduling/i)).toBeVisible();
   await expect(page.getByText(/patient documents/i)).toBeVisible();
 });
 
@@ -20,12 +19,13 @@ test('Create and revise a diagnosis.', async ({ page }) => {
   await bahmni.registerPatient();
 
   // replay
+  await bahmni.navigateToPatientDashboard();
   await bahmni.navigateToDiagnosis();
   await page.locator('#name-0').fill('Candidiasis (B37.9)');
   await page.getByText('Candidiasis (B37.9)').click();
   await page.locator('#order-0').getByRole('button', { name: /primary/i }).click();
   await page.locator('#certainty-0').getByRole('button', { name: /confirmed/i }).click();
-  await bahmni.saveOrder();
+  await bahmni.save();
 
   // verify creation
   await page.locator('#dashboard-link span.patient-name').click();
@@ -41,7 +41,7 @@ test('Create and revise a diagnosis.', async ({ page }) => {
   await diagnosisOrderButton.waitFor({ state: 'visible' });
   await diagnosisOrderButton.focus();
   await diagnosisOrderButton.click();
-  await bahmni.saveOrder();
+  await bahmni.save();
   await page.locator('#dashboard-link span.patient-name').click();
   await expect(page.locator('#diagnosisName')).toContainText(/candidiasis/i);
   await expect(page.locator('#order')).toContainText(/secondary/i);

e2e/tests/lab-orders.spec.ts

@@ -8,9 +8,8 @@ test.beforeEach(async ({ page }) => {
 
   await bahmni.login();
   await expect(page.getByText(/registration/i)).toBeVisible();
-  await expect(page.getByText(/linical/i)).toBeVisible();
+  await expect(page.getByText(/clinical/i)).toBeVisible();
   await expect(page.getByText(/admin/i)).toBeVisible();
-  await expect(page.getByText(/appointment scheduling/i)).toBeVisible();
   await expect(page.getByText(/patient documents/i)).toBeVisible();
 });
 
@@ -19,8 +18,8 @@ test('Create, revise and discontinue lab tests.', async ({ page }) => {
   await bahmni.registerPatient();
 
   // replay
-  await bahmni.goToHomePage();
-  await bahmni.goToLabSamples();
+  await bahmni.navigateToPatientDashboard();
+  await bahmni.navigateToLabSamples();
   await page.getByText('Blood', { exact: true }).click();
   await page.getByText('Malaria').click();
   await page.getByText('Urine').click();
@@ -31,7 +30,7 @@ test('Create, revise and discontinue lab tests.', async ({ page }) => {
   await page.getByText('Bacteries').click();
   await page.getByText('Sputum').click();
   await page.getByText('Serial sputum bacilloscopy').click();
-  await bahmni.saveOrder();
+  await bahmni.save();
 
   // verify creation
   await page.locator('#dashboard-link span.patient-name').click();
@@ -52,7 +51,7 @@ test('Create, revise and discontinue lab tests.', async ({ page }) => {
   await page.getByText('Urine Colour').click();
   await page.getByText('Stool', { exact: true }).click();
   await page.getByText('Stool Parasites').click();
-  await bahmni.saveOrder(); 
+  await bahmni.save();
 
   // verify revision
   await page.locator('#dashboard-link span.patient-name').click();
@@ -71,7 +70,7 @@ test('Create, revise and discontinue lab tests.', async ({ page }) => {
   await page.locator('#selected-orders li').filter({ hasText: 'Blood Sugar' }).locator('i').nth(1).click();
   await page.locator('#selected-orders li').filter({ hasText: 'Urine Colour' }).locator('i').nth(1).click();
   await page.locator('#selected-orders li').filter({ hasText: 'Stool Colour' }).locator('i').nth(1).click();
-  await bahmni.saveOrder();
+  await bahmni.save();
   await page.locator('#dashboard-link span.patient-name').click();
   await expect(page.locator('#Lab-Orders').getByText('Blood Sugar')).not.toBeVisible();
   await expect(page.locator('#Lab-Orders').getByText('Urine Colour')).not.toBeVisible();

e2e/tests/medications.spec.ts

@@ -8,9 +8,8 @@ test.beforeEach(async ({ page }) => {
 
   await bahmni.login();
   await expect(page.getByText(/registration/i)).toBeVisible();
-  await expect(page.getByText(/linical/i)).toBeVisible();
+  await expect(page.getByText(/clinical/i)).toBeVisible();
   await expect(page.getByText(/admin/i)).toBeVisible();
-  await expect(page.getByText(/appointment scheduling/i)).toBeVisible();
   await expect(page.getByText(/patient documents/i)).toBeVisible();
 });
 
@@ -19,7 +18,7 @@ test('Create, revise and discontinue a drug order.', async ({ page }) => {
   await bahmni.registerPatient();
 
   // replay
-  await bahmni.goToHomePage();
+  await bahmni.navigateToPatientDashboard();
   await bahmni.navigateToMedications();
   await bahmni.createMedication();
 
@@ -45,7 +44,7 @@ test('Create, revise and discontinue a drug order.', async ({ page }) => {
   await page.locator('#uniform-dose-unit').selectOption('string:Comprime(s)');
   await page.locator('#route').selectOption('string:Inhalation');
   await page.getByRole('button', { name: 'Add' }).click();
-  await bahmni.saveOrder();
+  await bahmni.save();
   await expect(medicationDetailsSelector).not.toContainText('2 Application(s)');
   await expect(medicationDetailsSelector).toContainText('4 Comprime(s)');
   await expect(medicationDetailsSelector).not.toContainText('Q3H');
@@ -57,7 +56,7 @@ test('Create, revise and discontinue a drug order.', async ({ page }) => {
   await expect(drugNameSelector).toContainText('Aspirine Co 81mg (Comprime)');
   await page.getByRole('button', { name: 'Stop' }).first().click();
   await page.getByPlaceholder('Notes').fill('Patient allergic to medicine');
-  await bahmni.saveOrder();
+  await bahmni.save();
   await page.locator('#dashboard-link span.patient-name').click();
   const medicationStatus = await page.locator('#dashboard-treatments span.discontinued-text').first();
   await expect(medicationStatus).toContainText('Stopped');