fix e2e test failure by closing menu

Author: david-crespo

test/e2e/instance-networking.e2e.ts

@@ -9,9 +9,9 @@ import { expect, test } from '@playwright/test'
 
 import {
   clickRowAction,
+  clickRowActions,
   expectRowVisible,
   expectVisible,
-  openRowActions,
   stopInstance,
 } from './utils'
 
@@ -79,21 +79,23 @@ test('Instance networking tab — NIC table', async ({ page }) => {
   await expect(nic3).toBeVisible()
 
   // See that the primary NIC cannot be deleted when other NICs exist
-  await openRowActions(page, 'nic-3')
-  await expect(page.getByRole('menuitem', { name: 'Delete' })).toBeDisabled()
-  await page.getByRole('menuitem', { name: 'Delete' }).hover()
+  await clickRowActions(page, 'nic-3')
+  const deleteButton = page.getByRole('menuitem', { name: 'Delete' })
+  await expect(deleteButton).toBeDisabled()
+  await deleteButton.hover()
   await expect(page.getByText('This network interface is primary and cannot')).toBeVisible()
 
+  // close the menu for nic-3, without the next line fails in FF and Safari (but not Chrome)
+  await clickRowActions(page, 'nic-3')
+
   // Delete the non-primary NIC
   await clickRowAction(page, 'my-nic', 'Delete')
   await expect(page.getByText('Are you sure you want to delete my-nic?')).toBeVisible()
   await page.getByRole('button', { name: 'Confirm' }).click()
   await expect(page.getByRole('cell', { name: 'my-nic' })).toBeHidden()
 
   // Now the primary NIC is deletable
-  await openRowActions(page, 'nic-3')
-  await expect(page.getByRole('menuitem', { name: 'Delete' })).toBeEnabled()
-  await page.getByRole('menuitem', { name: 'Delete' }).click()
+  await clickRowAction(page, 'nic-3', 'Delete')
   await page.getByRole('button', { name: 'Confirm' }).click()
   await expect(nic3).toBeHidden()
 })

test/e2e/instance.e2e.ts

@@ -7,10 +7,10 @@
  */
 import {
   clickRowAction,
+  clickRowActions,
   closeToast,
   expect,
   expectRowVisible,
-  openRowActions,
   test,
   type Page,
 } from './utils'
@@ -41,7 +41,7 @@ test('can start a failed instance', async ({ page }) => {
   await page.goto('/projects/mock-project/instances')
 
   // check the start button disabled message on a running instance
-  await openRowActions(page, 'db1')
+  await clickRowActions(page, 'db1')
   await page.getByRole('menuitem', { name: 'Start' }).hover()
   await expect(
     page.getByText('Only stopped or failed instances can be started')
@@ -118,14 +118,14 @@ test('can reboot a running instance', async ({ page }) => {
 test('cannot reboot a failed instance', async ({ page }) => {
   await page.goto('/projects/mock-project/instances')
   await expectInstanceState(page, 'you-fail', 'failed')
-  await openRowActions(page, 'you-fail')
+  await clickRowActions(page, 'you-fail')
   await expect(page.getByRole('menuitem', { name: 'Reboot' })).toBeDisabled()
 })
 
 test('cannot reboot a starting instance, or a stopped instance', async ({ page }) => {
   await page.goto('/projects/mock-project/instances')
   await expectInstanceState(page, 'not-there-yet', 'starting')
-  await openRowActions(page, 'not-there-yet')
+  await clickRowActions(page, 'not-there-yet')
   await expect(page.getByRole('menuitem', { name: 'Reboot' })).toBeDisabled()
   // hit escape to close the menu so clickRowAction succeeds
   await page.keyboard.press('Escape')
@@ -136,21 +136,21 @@ test('cannot reboot a starting instance, or a stopped instance', async ({ page }
   await expectInstanceState(page, 'not-there-yet', 'stopping')
   await expectInstanceState(page, 'not-there-yet', 'stopped')
   // reboot is still disabled for a stopped instance
-  await openRowActions(page, 'not-there-yet')
+  await clickRowActions(page, 'not-there-yet')
   await expect(page.getByRole('menuitem', { name: 'Reboot' })).toBeDisabled()
 })
 
 test('cannot resize a running or starting instance', async ({ page }) => {
   await page.goto('/projects/mock-project/instances')
 
   await expectInstanceState(page, 'db1', 'running')
-  await openRowActions(page, 'db1')
+  await clickRowActions(page, 'db1')
   await expect(page.getByRole('menuitem', { name: 'Resize' })).toBeDisabled()
 
   await page.keyboard.press('Escape') // get out of the menu
 
   await expectInstanceState(page, 'not-there-yet', 'starting')
-  await openRowActions(page, 'not-there-yet')
+  await clickRowActions(page, 'not-there-yet')
   await expect(page.getByRole('menuitem', { name: 'Resize' })).toBeDisabled()
 })
 
@@ -254,7 +254,7 @@ async function expectRowMenuStaysOpen(page: Page, rowSelector: string) {
   await expect(menu).toBeHidden()
   await expect(stopped).toBeHidden()
 
-  await openRowActions(page, rowSelector)
+  await clickRowActions(page, rowSelector)
   await expect(stopped).toBeHidden() // still not stopped yet
   await expect(menu).toBeVisible()
 
@@ -300,7 +300,7 @@ test("polling doesn't close row actions: instances", async ({ page }) => {
   await expect(menu).toBeHidden()
   await expect(stopped).toBeHidden()
 
-  await openRowActions(page, 'db1')
+  await clickRowActions(page, 'db1')
   await expect(stopped).toBeHidden() // still not stopped yet
   await expect(menu).toBeVisible()
 

test/e2e/utils.ts

@@ -154,7 +154,7 @@ export async function closeToast(page: Page) {
 export const clipboardText = async (page: Page) =>
   page.evaluate(() => navigator.clipboard.readText())
 
-export const openRowActions = async (page: Page, name: string) => {
+export const clickRowActions = async (page: Page, name: string) => {
   await page
     .getByRole('row', { name, exact: false })
     .getByRole('button', { name: 'Row actions' })
@@ -163,7 +163,7 @@ export const openRowActions = async (page: Page, name: string) => {
 
 /** Select row by `rowName`, click the row actions button, and click `actionName` */
 export async function clickRowAction(page: Page, rowName: string, actionName: string) {
-  await openRowActions(page, rowName)
+  await clickRowActions(page, rowName)
   await page.getByRole('menuitem', { name: actionName }).click()
 }