fix: more test fixes

equinor · Jun 18, 2024 · d6e2caf · d6e2caf
1 parent 19faf29
commit d6e2caf
Show file tree

Hide file tree

Showing 3 changed files with 54 additions and 59 deletions.
diff --git a/e2e/tests/plugin-form-Nested.spec.ts b/e2e/tests/plugin-form-Nested.spec.ts
@@ -89,21 +89,23 @@ test('View accountant yaml', async () => {
 })
 
 test('Adding a trainee', async () => {
-  const trainee = page.getByTestId('trainee')
   await page.getByTestId('trainee').getByText('Create').click()
-  await trainee.getByTestId('form-text-widget-Name').fill('Peter Pan')
-  await trainee
+  await page.reload()
+  await expect(page.getByTestId('form-text-widget-Name').last()).toBeVisible()
+  await page.getByTestId('form-text-widget-Name').last().fill('Peter Pan')
+  await page
     .getByTestId('form-number-widget-Phone Number (Optional)')
+    .last()
     .fill('123')
   await page.getByRole('button', { name: 'Submit' }).click()
   await expect(page.getByRole('alert')).toHaveText(['Document updated'])
   await page.getByRole('button', { name: 'close', exact: true }).click()
   await page.reload()
-  await expect(trainee.getByTestId('form-text-widget-Name')).toHaveValue(
+  await expect(page.getByTestId('form-text-widget-Name').last()).toHaveValue(
     'Peter Pan'
   )
   await expect(
-    trainee.getByTestId('form-number-widget-Phone Number (Optional)')
+    page.getByTestId('form-number-widget-Phone Number (Optional)').last()
   ).toHaveValue('123')
 })
 
@@ -135,7 +137,7 @@ test('Locations', async () => {
 
 test('New car', async () => {
   const carsDiv = page.getByTestId('cars')
-  await carsDiv.getByLabel('append-item').click()
+  await carsDiv.getByLabel('Add to list').click()
   await carsDiv.getByRole('button', { name: 'Save' }).click()
   await carsDiv.getByRole('button', { name: 'Expand item' }).last().click()
   await carsDiv.getByTestId('form-text-widget-Name').fill('McLaren')
@@ -158,7 +160,7 @@ test('New customer', async () => {
   await customersDiv.getByRole('button', { name: 'Open' }).click()
   const lastTabPanel = page.getByRole('tabpanel').last()
   await expect(lastTabPanel).toBeVisible()
-  await lastTabPanel.getByLabel('append-item').click()
+  await lastTabPanel.getByLabel('Add to list').click()
   await lastTabPanel.getByRole('button', { name: 'Save' }).click()
   await lastTabPanel.getByRole('button', { name: 'Expand item' }).last().click()
   await lastTabPanel.getByTestId('form-text-widget-Name').fill('Lewis')
@@ -170,7 +172,7 @@ test('New customer', async () => {
   await page.getByRole('button', { name: 'close', exact: true }).click()
   await page.reload()
   await customersDiv.getByRole('button', { name: 'Open' }).click()
-  await expect(page.getByText('Lewis')).toBeVisible()
+  await expect(page.getByText('Lewis').last()).toBeVisible()
   await page
     .getByRole('button', { name: 'Expand item', exact: true })
     .last()

diff --git a/e2e/tests/plugin-form-UncontainedObject.spec.ts b/e2e/tests/plugin-form-UncontainedObject.spec.ts
@@ -34,15 +34,15 @@ test('uncontainedObject', async ({ page }) => {
   await test.step('Assert Accountant', async () => {
     await page
       .getByTestId('accountant')
-      .getByRole('button', { name: 'Collapse Accountant' })
+      .getByRole('button', { name: 'Accountant' })
       .click()
     await expect(
       page.getByTestId('accountant').getByRole('code').getByText('Miranda')
     ).not.toBeVisible()
     await expect(page.getByRole('code').getByText('1337')).not.toBeVisible()
     await page
       .getByTestId('accountant')
-      .getByRole('button', { name: 'Expand' })
+      .getByRole('button', { name: 'Accountant' })
       .click()
     await expect(
       page.getByTestId('accountant').getByRole('code').getByText('Miranda')

diff --git a/e2e/tests/plugin-form-relative_reference.spec.ts b/e2e/tests/plugin-form-relative_reference.spec.ts
@@ -14,7 +14,7 @@ test('Relative reference', async ({ page }) => {
   )
 
   await test.step('Update root reference', async () => {
-    await page.getByTestId('data').getByText('Data').click()
+    await page.getByTestId('data').getByRole('button', { name: 'Data' }).click()
     await expect(page.getByRole('code')).toBeVisible()
     await page.getByRole('button', { name: 'Edit' }).last().click()
     await page.getByTestId('form-number-widget-A Number').fill('1')
@@ -83,67 +83,60 @@ test('Relative reference', async ({ page }) => {
   })
 
   await test.step('Nested local reference', async () => {
-    await page.getByTestId('tasks').getByRole('button').first().click()
-    await page.getByTestId('expandListItem-0').click()
-    await expect(page.getByRole('code')).toBeVisible()
-    await page.getByRole('button', { name: 'Edit' }).last().click()
-    await page.getByTestId('data').first().click()
-    await expect(page.getByRole('code')).toBeVisible()
-    await page.getByRole('button', { name: 'Edit' }).last().click()
-    await expect(page.getByTestId('form-number-widget-A Number')).toHaveValue(
+    const area = page.getByTestId(
+      'enabled:dmss://DemoDataSource/$relativeReference'
+    )
+    await area.getByTestId('tasks').getByRole('button').first().click()
+    await area.getByTestId('expandListItem-0').last().click()
+    await expect(area.getByRole('code')).toBeVisible()
+    await area.getByRole('button', { name: 'Edit' }).last().click()
+    await area.getByTestId('data').first().click()
+    await expect(area.getByRole('code')).toBeVisible()
+    await area.getByRole('button', { name: 'Edit' }).last().click()
+    await expect(area.getByTestId('form-number-widget-A Number')).toHaveValue(
       '300'
     )
-    await page.getByTestId('form-number-widget-A Number').fill('3')
-    await page.getByRole('button', { name: 'Submit' }).click()
+    await area.getByTestId('form-number-widget-A Number').fill('3')
+    await area.getByRole('button', { name: 'Submit' }).click()
     await expect(page.getByRole('alert')).toHaveText(['Document updated'])
-    await page.getByRole('button', { name: 'Close data' }).click()
-    await page.getByTestId('job').first().click()
-    await expect(page.getByRole('code')).toBeVisible()
-    await page.getByRole('button', { name: 'Edit' }).last().click()
-    await page.getByTestId('input').getByRole('button').first().click()
-    await expect(page.getByRole('code')).toBeVisible()
-    await page.getByRole('button', { name: 'Edit' }).last().click()
-    await expect(page.getByTestId('form-number-widget-A Number')).toHaveValue(
+    await area.getByRole('button', { name: 'Close data' }).click()
+    await area.getByTestId('job').first().click()
+    await expect(area.getByRole('code')).toBeVisible()
+    await area.getByRole('button', { name: 'Edit' }).last().click()
+    await area.getByTestId('input').getByRole('button').first().click()
+    await expect(area.getByRole('code')).toBeVisible()
+    await area.getByRole('button', { name: 'Edit' }).last().click()
+    await expect(area.getByTestId('form-number-widget-A Number')).toHaveValue(
       '3'
     )
     // await page.getByTestId('expandListItem-0').click()
   })
 
   await test.step('Nested root reference', async () => {
-    await page.getByTestId('expandListItem-1').click()
-    await expect(page.locator('pre').getByRole('code')).toBeVisible()
-    await page.getByRole('button', { name: 'Edit' }).last().click()
-    await page.getByText('Data', { exact: true }).nth(2).click()
-    await expect(page.getByRole('code')).toBeVisible()
-    await page.getByRole('button', { name: 'Edit' }).last().click()
+    const area = page.getByTestId(
+      'enabled:dmss://DemoDataSource/$relativeReference'
+    )
+    await area.getByTestId('expandListItem-1').click()
+    await expect(area.locator('pre').getByRole('code')).toBeVisible()
+    await area.getByRole('button', { name: 'Edit' }).last().click()
+    await area.getByText('Data').last().click()
+    await expect(area.getByRole('code')).toBeVisible()
+    await area.getByRole('button', { name: 'Edit' }).last().click()
     await expect(
-      page.getByTestId('form-number-widget-A Number').last()
+      area.getByTestId('form-number-widget-A Number').last()
     ).toHaveValue('400')
-    await page.getByTestId('form-number-widget-A Number').last().fill('4')
-    await page.getByRole('button', { name: 'Submit' }).last().click()
+    await area.getByTestId('form-number-widget-A Number').last().fill('4')
+    await area.getByRole('button', { name: 'Submit' }).last().click()
     await expect(page.getByRole('alert')).toHaveText(['Document updated'])
-    await page
-      .getByRole('button', { name: 'close', exact: true })
-      .last()
-      .click()
-    await expect(page.getByRole('alert')).not.toBeVisible()
-    await page.getByRole('button', { name: 'Close data' }).click()
-    await page.getByText('Job', { exact: true }).nth(4).click()
-    await expect(page.getByRole('code')).toBeVisible()
-    await page.getByRole('button', { name: 'Edit' }).last().click()
-    await page.getByText('Input', { exact: true }).nth(1).click()
-    await expect(page.getByRole('code')).toBeVisible()
-    await page.getByRole('button', { name: 'Edit' }).last().click()
+    await area.getByRole('button', { name: 'Close data' }).click()
+    await area.getByRole('button', { name: 'Job Optional' }).last().click()
+    await expect(area.getByRole('code')).toBeVisible()
+    await area.getByRole('button', { name: 'Edit' }).last().click()
+    await area.getByText('Input', { exact: true }).nth(1).click()
+    await expect(area.getByRole('code')).toBeVisible()
+    await area.getByRole('button', { name: 'Edit' }).last().click()
     await expect(
-      page.getByTestId('form-number-widget-A Number').last()
+      area.getByTestId('form-number-widget-A Number').last()
     ).toHaveValue('10')
-    await page.getByRole('button', { name: 'Close job' }).last().click()
-
-    await page.getByText('Data', { exact: true }).nth(2).click()
-    await expect(page.getByRole('code')).toBeVisible()
-    await page.getByRole('button', { name: 'Edit' }).last().click()
-    await expect(
-      page.getByTestId('form-number-widget-A Number').last()
-    ).toHaveValue('4')
   })
 })