fix: update tests

equinor · Jun 17, 2024 · ebc8c9f · ebc8c9f
1 parent f3ce0d3
commit ebc8c9f
Show file tree

Hide file tree

Showing 16 changed files with 220 additions and 280 deletions.
diff --git a/e2e/tests/plugin-form-Nested.spec.ts b/e2e/tests/plugin-form-Nested.spec.ts
@@ -90,8 +90,7 @@ test('View accountant yaml', async () => {
 
 test('Adding a trainee', async () => {
   const trainee = page.getByTestId('trainee')
-  // await trainee.getByLabel('Add and save').click()
-  await page.getByTestId('trainee').getByLabel('Create new entity').click()
+  await page.getByTestId('trainee').getByText('Create').click()
   await trainee.getByTestId('form-text-widget-Name').fill('Peter Pan')
   await trainee
     .getByTestId('form-number-widget-Phone Number (Optional)')

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

diff --git a/e2e/tests/plugin-form-dimensional_scalar.spec.ts b/e2e/tests/plugin-form-dimensional_scalar.spec.ts
@@ -103,7 +103,7 @@ test('Dimensional scalar', async ({ page }) => {
       page.getByTestId('maximumWaveHeight').getByRole('paragraph').first()
     ).toContainText('New Maximum')
     await expect(
-      page.getByTestId('maximumWaveHeight').locator('span')
+      page.getByTestId('maximumWaveHeight').locator('span').locator('span')
     ).toContainText('€')
   })
 })
diff --git a/e2e/tests/plugin-form-model_uncontained-complex_attribute.spec.ts b/e2e/tests/plugin-form-model_uncontained-complex_attribute.spec.ts
@@ -15,9 +15,7 @@ test('Model uncontained complex attribute', async ({ page }) => {
     await expect(page.getByLabel('Name')).toHaveValue('TheBlackPearl')
     await page.getByLabel('Open in tab').click()
     await expect(page.getByRole('tab', { name: 'captain' })).toBeVisible()
-    await expect(
-      page.getByText('CaptainJackSparrow', { exact: true })
-    ).toBeVisible()
+    await expect(page.getByRole('code')).toContainText('CaptainJackSparrow')
     await page.getByRole('button', { name: 'Edit' }).nth(1).click()
     await expect(page.getByRole('textbox')).toHaveValue('CaptainJackSparrow')
     await expect(

diff --git a/e2e/tests/plugin-form-relative_reference.spec.ts b/e2e/tests/plugin-form-relative_reference.spec.ts
@@ -24,7 +24,7 @@ test('Relative reference', async ({ page }) => {
     await expect(page.getByRole('alert')).not.toBeVisible()
     await page.getByRole('button', { name: 'Close data' }).click()
 
-    await page.getByTestId('job').getByText('Job').click()
+    await page.getByTestId('job').getByRole('button').first().click()
     await expect(page.getByRole('code')).toBeVisible()
     await page.getByRole('button', { name: 'Edit' }).last().click()
     await page.getByTestId('input').getByText('Input').click()
@@ -40,7 +40,7 @@ test('Relative reference', async ({ page }) => {
     await page.getByRole('button', { name: 'close', exact: true }).click()
     await expect(page.getByRole('alert')).not.toBeVisible()
     await page.getByRole('button', { name: 'Close job' }).click()
-    await page.getByTestId('data').getByText('Data').click()
+    await page.getByTestId('data').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(
@@ -50,13 +50,13 @@ test('Relative reference', async ({ page }) => {
   })
 
   await test.step('Update local reference', async () => {
-    await page.getByTestId('task').getByText('Task').click()
+    await page.getByTestId('task').getByRole('button').first().click()
     await expect(page.getByRole('code')).toBeVisible()
     await page.getByRole('button', { name: 'Edit' }).last().click()
     await expect(page.getByTestId('form-text-widget-Name').last()).toHaveValue(
       'ChildTask'
     )
-    await page.getByTestId('data').getByText('Data').last().click()
+    await page.getByTestId('data').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(
@@ -68,7 +68,7 @@ test('Relative reference', async ({ page }) => {
     await page.getByRole('button', { name: 'close', exact: true }).click()
     await expect(page.getByRole('alert')).not.toBeVisible()
     await page.getByRole('button', { name: 'Close data' }).click()
-    await page.getByTestId('job').getByText('Job').last().click()
+    await page.getByTestId('job').getByRole('button').first().click()
     await expect(page.getByRole('code')).toBeVisible()
     await page.getByRole('button', { name: 'Edit' }).last().click()
     await page.getByTestId('input').getByText('Input').click()
@@ -78,7 +78,7 @@ test('Relative reference', async ({ page }) => {
       '2'
     )
     await page.getByRole('button', { name: 'Close task' }).click()
-    await page.getByTestId('data').getByText('Data').click()
+    await page.getByTestId('data').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(
@@ -88,11 +88,11 @@ test('Relative reference', async ({ page }) => {
   })
 
   await test.step('Nested local reference', async () => {
-    await page.getByTestId('tasks').getByText('Tasks').click()
+    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.getByText('Data', { exact: true }).nth(1).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(
@@ -104,10 +104,10 @@ test('Relative reference', async ({ page }) => {
     await page.getByRole('button', { name: 'close', exact: true }).click()
     await expect(page.getByRole('alert')).not.toBeVisible()
     await page.getByRole('button', { name: 'Close data' }).click()
-    await page.getByText('Job', { exact: true }).nth(3).click()
+    await page.getByTestId('job').first().click()
     await expect(page.getByRole('code')).toBeVisible()
     await page.getByRole('button', { name: 'Edit' }).last().click()
-    await page.getByText('Input', { exact: true }).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(

diff --git a/e2e/tests/plugin-header-roles_header_example.spec.ts b/e2e/tests/plugin-header-roles_header_example.spec.ts
@@ -1,5 +1,7 @@
 import { expect, test } from '@playwright/test'
 
+test.use({ permissions: ['clipboard-write'] })
+
 test.beforeEach(async ({ page }) => {
   await page.goto('http://localhost:3000/')
   await page.getByRole('button', { name: 'DemoDataSource' }).click()
@@ -11,12 +13,10 @@ test.beforeEach(async ({ page }) => {
 
 test('Admin role', async ({ page }) => {
   await page.getByLabel('AppSelector').nth(1).click()
-  await expect(
-    page.getByRole('button', { name: 'Yaml', exact: true })
-  ).toBeVisible()
-  await expect(page.getByRole('button', { name: 'Edit' })).toBeVisible()
-  await expect(page.getByRole('button', { name: 'Explorer' })).toBeVisible()
-  await page.getByRole('button', { name: 'Edit' }).click()
+  await expect(page.getByRole('menuitem', { name: 'Yaml' })).toBeVisible()
+  await expect(page.getByRole('menuitem', { name: 'Edit' })).toBeVisible()
+  await expect(page.getByRole('menuitem', { name: 'Explorer' })).toBeVisible()
+  await page.getByRole('menuitem', { name: 'Edit' }).click()
   await expect(page.getByTestId('form-text-widget-Name')).toHaveValue(
     'elonMusk'
   )
@@ -31,16 +31,13 @@ test('Change to operator role and back', async ({ page }) => {
 
   await test.step('Edit option not visible', async () => {
     await page.getByLabel('AppSelector').nth(1).click()
-
-    await expect(
-      page.getByRole('button', { name: 'Yaml', exact: true })
-    ).toBeVisible()
-    await expect(page.getByRole('button', { name: 'Edit' })).not.toBeVisible()
-    await expect(page.getByRole('button', { name: 'Explorer' })).toBeVisible()
+    await expect(page.getByRole('menuitem', { name: 'Yaml' })).toBeVisible()
+    await expect(page.getByRole('menuitem', { name: 'Edit' })).not.toBeVisible()
+    await expect(page.getByRole('menuitem', { name: 'Explorer' })).toBeVisible()
   })
 
   await test.step('Edit option not visible through Explorer', async () => {
-    await page.getByRole('button', { name: 'Explorer' }).click()
+    await page.getByRole('menuitem', { name: 'Explorer' }).click()
     await page
       .locator('li')
       .filter({ hasText: /^data sourceDemoDataSource$/ })
@@ -64,25 +61,20 @@ test('Change to operator role and back', async ({ page }) => {
     await page.getByRole('button', { name: 'file elonMusk' }).nth(1).click()
     await expect(page.getByRole('code')).toBeVisible()
     await page.getByLabel('AppSelector').nth(1).click()
-    await expect(
-      page.getByRole('button', { name: 'Yaml', exact: true })
-    ).toBeVisible()
-    await expect(page.getByRole('button', { name: 'Edit' })).not.toBeVisible()
-    await expect(page.getByRole('button', { name: 'Explorer' })).toBeVisible()
-    await page.getByRole('button', { name: 'Yaml', exact: true }).click()
+    await expect(page.getByRole('menuitem', { name: 'Yaml' })).toBeVisible()
+    await expect(page.getByRole('menuitem', { name: 'Edit' })).not.toBeVisible()
+    await expect(page.getByRole('menuitem', { name: 'Explorer' })).toBeVisible()
+    await page.getByRole('menuitem', { name: 'Yaml' }).click()
   })
 
   await test.step('Change back to admin', async () => {
     await page.getByLabel('AppSelector').nth(1).click()
 
-    await page
-      .getByRole('button', { name: 'Yaml', exact: true })
-      .first()
-      .click()
+    await page.getByRole('menuitem', { name: 'Yaml' }).first().click()
     await page.getByRole('button', { name: 'User' }).click()
     await page.getByLabel('admin').check()
     await page.getByRole('button', { name: 'Save' }).click()
     await page.getByLabel('AppSelector').nth(1).click()
-    await expect(page.getByRole('button', { name: 'Edit' })).toBeVisible()
+    await expect(page.getByRole('menuitem', { name: 'Edit' })).toBeVisible()
   })
 })
diff --git a/e2e/tests/plugin-header.spec.ts b/e2e/tests/plugin-header.spec.ts
@@ -45,6 +45,6 @@ test('About', async ({ page }) => {
 
 test('Recipe list', async ({ page }) => {
   await page.getByLabel('AppSelector').click()
-  await page.getByRole('button', { name: 'Edit' }).click()
+  await page.getByRole('menuitem', { name: 'Edit' }).click()
   await expect(page.getByTestId('form-text-widget-Name')).toHaveValue('example')
 })