Add a locator to table row

openmrs · Jun 23, 2023 · a12cdc6 · a12cdc6
1 parent d1d9269
commit a12cdc6
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 14 deletions.
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
@@ -24,7 +24,7 @@ jobs:
       - name: Setup node
         uses: actions/setup-node@v3
         with:
-          node-version: '16'
+          node-version: 18
 
       - name: Install dependencies
         run: yarn install --immutable
@@ -62,7 +62,7 @@ jobs:
       - name: Setup node
         uses: actions/setup-node@v3
         with:
-          node-version: '16'
+          node-version: 18
 
       - name: Install dependencies
         run: yarn install --immutable

diff --git a/e2e/pages/PatientAllergiesPage.ts b/e2e/pages/PatientAllergiesPage.ts
@@ -3,6 +3,7 @@ import { Page } from '@playwright/test';
 export class PatientAllergiesPage {
   constructor(readonly page: Page) {}
 
+  readonly tableRow = () => this.page.locator('tr');
   async goto(uuid: string) {
     await this.page.goto('/openmrs/spa/patient/' + uuid + '/chart/Allergies');
   }

diff --git a/e2e/specs/record-drug-allergies.spec.ts b/e2e/specs/record-drug-allergies.spec.ts
@@ -45,10 +45,10 @@ test('Add drug allergy to patient', async ({ page, api }) => {
   });
 
   await test.step('And I see the data of the allergy that I saved', async () => {
-    await expect(allergiesPage.page.getByText('ACE inhibitors')).toBeVisible();
-    await expect(allergiesPage.page.getByText('Mental status change')).toBeVisible();
-    await expect(allergiesPage.page.getByText('LOW')).toBeVisible();
-    await expect(allergiesPage.page.getByText('Test comment')).toBeVisible();
+    await expect(allergiesPage.tableRow().getByText('ACE inhibitors')).toBeVisible();
+    await expect(allergiesPage.tableRow().getByText('Mental status change')).toBeVisible();
+    await expect(allergiesPage.tableRow().getByText('LOW')).toBeVisible();
+    await expect(allergiesPage.tableRow().getByText('Test comment')).toBeVisible();
   });
 });
 

diff --git a/e2e/specs/record-environmental-allergy.spec.ts b/e2e/specs/record-environmental-allergy.spec.ts
@@ -49,10 +49,10 @@ test('Add environmental allergy to patient', async ({ page, api }) => {
   });
 
   await test.step('And I see the data of the allergy that I saved', async () => {
-    await expect(allergiesPage.page.getByText('Dust')).toBeVisible();
-    await expect(allergiesPage.page.getByText('Mental status change')).toBeVisible();
-    await expect(allergiesPage.page.getByText('LOW')).toBeVisible();
-    await expect(allergiesPage.page.getByText('Test comment')).toBeVisible();
+    await expect(allergiesPage.tableRow().getByText('Dust')).toBeVisible();
+    await expect(allergiesPage.tableRow().getByText('Mental status change')).toBeVisible();
+    await expect(allergiesPage.tableRow().getByText('LOW')).toBeVisible();
+    await expect(allergiesPage.tableRow().getByText('Test comment')).toBeVisible();
   });
 });
 

diff --git a/e2e/specs/record-food-allergy.spec.ts b/e2e/specs/record-food-allergy.spec.ts
@@ -49,10 +49,10 @@ test('Add Food allergy to patient', async ({ page, api }) => {
   });
 
   await test.step('And I see the data of the allergy that I saved', async () => {
-    await expect(allergiesPage.page.getByText('Eggs')).toBeVisible();
-    await expect(allergiesPage.page.getByText('Mental status change')).toBeVisible();
-    await expect(allergiesPage.page.getByText('LOW')).toBeVisible();
-    await expect(allergiesPage.page.getByText('Test comment')).toBeVisible();
+    await expect(allergiesPage.tableRow().getByText('Eggs')).toBeVisible();
+    await expect(allergiesPage.tableRow().getByText('Mental status change')).toBeVisible();
+    await expect(allergiesPage.tableRow().getByText('LOW')).toBeVisible();
+    await expect(allergiesPage.tableRow().getByText('Test comment')).toBeVisible();
   });
 });