From 6767ab07d335c8861ae58799f5127fb57f4085c0 Mon Sep 17 00:00:00 2001
From: Roar Larsen <roarla@equinor.com>
Date: Wed, 22 Nov 2023 10:53:51 +0100
Subject: [PATCH] fix: update tests with new menu button

---
 ...plugin-header-roles_header_example.spec.ts | 37 ++++++++++++-------
 e2e/tests/plugin-header.spec.ts               |  2 +-
 2 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/e2e/tests/plugin-header-roles_header_example.spec.ts b/e2e/tests/plugin-header-roles_header_example.spec.ts
index 494b7dc1e..d80ab712a 100755
--- a/e2e/tests/plugin-header-roles_header_example.spec.ts
+++ b/e2e/tests/plugin-header-roles_header_example.spec.ts
@@ -11,10 +11,12 @@ test.beforeEach(async ({ page }) => {
 
 test('Admin role', async ({ page }) => {
   await page.getByRole('button', { name: 'Menu' }).nth(1).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.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.getByTestId('form-text-widget-Name')).toHaveValue(
     'elonMusk'
   )
@@ -29,13 +31,15 @@ test('Change to operator role and back', async ({ page }) => {
 
   await test.step('Edit option not visible', async () => {
     await page.getByRole('button', { name: 'Menu' }).nth(1).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 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 test.step('Edit option not visible through Explorer', async () => {
-    await page.getByRole('menuitem', { name: 'Explorer' }).click()
+    await page.getByRole('button', { name: 'Explorer' }).click()
     await page
       .locator('li')
       .filter({ hasText: /^data sourceDemoDataSource$/ })
@@ -57,19 +61,26 @@ test('Change to operator role and back', async ({ page }) => {
       .getByRole('button')
       .click()
     await page.getByRole('button', { name: 'file elonMusk' }).nth(1).click()
+    await expect(page.getByRole('code')).toBeVisible()
     await page.getByRole('button', { name: 'Menu' }).nth(2).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 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 test.step('Change back to admin', async () => {
     await page.getByRole('button', { name: 'Menu' }).nth(1).click()
-    await page.getByRole('menuitem', { name: 'Yaml' }).first().click()
+    await page
+      .getByRole('button', { name: 'Yaml', exact: true })
+      .first()
+      .click()
     await page.getByRole('button', { name: 'User' }).click()
     await page.getByLabel('admin').check()
     await page.getByRole('button', { name: 'Save' }).click()
     await page.getByRole('button', { name: 'Menu' }).nth(1).click()
-    await expect(page.getByRole('menuitem', { name: 'Edit' })).toBeVisible()
+    await expect(page.getByRole('button', { name: 'Edit' })).toBeVisible()
   })
 })
diff --git a/e2e/tests/plugin-header.spec.ts b/e2e/tests/plugin-header.spec.ts
index a69fe8ea3..9ed5bcca8 100755
--- a/e2e/tests/plugin-header.spec.ts
+++ b/e2e/tests/plugin-header.spec.ts
@@ -50,6 +50,6 @@ test('About', async ({ page }) => {
 
 test('Recipe list', async ({ page }) => {
   await page.getByRole('button', { name: 'Menu' }).nth(1).click()
-  await page.getByRole('menuitem', { name: 'Edit' }).click()
+  await page.getByRole('button', { name: 'Edit' }).click()
   await expect(page.getByTestId('form-text-widget-Name')).toHaveValue('example')
 })