test: Make e2e tests more robust

AI-assistant: GitHub Copilot v1.0.24 (GPT-5.4 (medium))

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>

Author: AndyScherzinger

playwright/e2e/context.spec.ts

@@ -15,6 +15,7 @@ import {
 	loadContext,
 	loadTable,
 	openContextEditModal,
+	openCreateRowModal,
 } from '../support/commands'
 import { login } from '../support/login'
 
@@ -240,11 +241,16 @@ test.describe('Manage a context', () => {
 		await page.locator('[data-cy="editContextSubmitBtn"]').click()
 
 		await createTextLineColumn(page, 'title', '', '', true)
-		await page.locator('button').filter({ hasText: 'Create row' }).click()
+		await openCreateRowModal(page)
 		await fillInValueTextLine(page, 'title', 'first row')
+		const createRowResponse = page.waitForResponse(r => r.url().includes('/rows') && r.request().method() === 'POST')
 		await page.locator('[data-cy="createRowSaveButton"]').click()
+		await createRowResponse
+		await expect(page.locator('[data-cy="createRowModal"]')).toBeHidden()
 
-		await expect(page.locator('[data-cy="ncTable"] table').filter({ hasText: 'first row' })).toBeVisible()
+		await expect(
+			page.locator('[data-cy="customTableRow"]').filter({ hasText: 'first row' }).first(),
+		).toBeVisible()
 	})
 
 	test('Modify context resources and their permissions', async ({ userPage: { page }, request }) => {
@@ -294,16 +300,20 @@ test.describe('Manage a context', () => {
 		await expect(page.locator('h1', { hasText: contextTitle })).toBeVisible()
 		await expect(page.locator('h1', { hasText: tableTitle })).toBeVisible()
 
-		await page.locator('button').filter({ hasText: 'Create row' }).click()
+		await openCreateRowModal(page)
 		await fillInValueTextLine(page, 'title', 'first row')
+		const createRowResponse = page.waitForResponse(r => r.url().includes('/rows') && r.request().method() === 'POST')
 		await page.locator('[data-cy="createRowSaveButton"]').click()
+		await createRowResponse
+		await expect(page.locator('[data-cy="createRowModal"]')).toBeHidden()
 
-		await expect(page.locator('[data-cy="ncTable"] table').filter({ hasText: 'first row' })).toBeVisible()
+		const createdRow = page.locator('[data-cy="customTableRow"]').filter({ hasText: 'first row' }).first()
+		await expect(createdRow).toBeVisible()
 
-		await page.locator('[data-cy="ncTable"] [data-cy="customTableRow"]').filter({ hasText: 'first row' }).locator('[data-cy="editRowBtn"]').click()
+		await createdRow.locator('[data-cy="editRowBtn"]').click()
 		await page.locator('[data-cy="editRowDeleteButton"]').click()
 		await page.locator('[data-cy="editRowDeleteConfirmButton"]').click()
 
-		await expect(page.locator('[data-cy="ncTable"] table', { hasText: 'first row' })).toBeHidden()
+		await expect(createdRow).toBeHidden()
 	})
 })

playwright/e2e/view-mandatory-state.spec.ts

@@ -8,7 +8,7 @@ import { test, expect } from '../support/fixtures'
 import type { BrowserContext, Page } from '@playwright/test'
 import { createRandomUser } from '../support/api'
 import { login } from '../support/login'
-import { createTable, createTextLineColumn, fillInValueTextLine, loadTable } from '../support/commands'
+import { createTable, createTextLineColumn, fillInValueTextLine, loadTable, openCreateRowModal } from '../support/commands'
 
 const tableTitle = 'Mandatory test table'
 
@@ -18,7 +18,7 @@ async function setupMandatoryTable(page: Page) {
 	await createTextLineColumn(page, 'description', '', '', false)
 
 	// create one row
-	await page.locator('[data-cy="createRowBtn"]').click()
+	await openCreateRowModal(page)
 	await fillInValueTextLine(page, 'title', 'first row')
 	await fillInValueTextLine(page, 'description', 'desc 1')
 	await page.locator('[data-cy="createRowSaveButton"]').click()
@@ -135,11 +135,12 @@ test.describe('Mandatory Column Functionality', () => {
 		await expect(page.locator('[data-cy="editRowModal"]')).toBeVisible()
 
 		// should show error when mandatory field is empty
-		const input = page.locator('[data-cy="editRowModal"] input').first()
+		const input = page.locator('[data-cy="editRowModal"] [data-cy="title"] input').first()
 		await input.fill('')
-		await input.blur()
 
-		await expect(page.locator('[data-cy="editRowModal"]').locator('.notecard--error, .note-card--error, .error, [type="error"]').first()).toBeVisible({ timeout: 15000 })
+		await expect(
+			page.locator('[data-cy="editRowModal"] [data-cy="rowMandatoryError"]'),
+		).toBeVisible({ timeout: 15000 })
 
 		// Check that save button is disabled
 		const saveBtn = page.locator('[data-cy="editRowSaveButton"]')

playwright/support/commands.ts

@@ -268,14 +268,15 @@ export async function openCreateColumnModal(
 		timeout: 10000,
 	})
 	if (isFirstColumn) {
-		const createBtn = page
-			.locator('.button-vue__text')
-			.filter({ hasText: 'Create column' })
+		const createBtn = page.locator('[data-cy="emptyTableCreateColumnBtn"]')
 		await createBtn.waitFor({ state: 'visible' })
 		await createBtn.click({ force: true })
 	} else {
 		await clickOnTableThreeDotMenu(page, 'Create column')
 	}
+	await expect(page.getByRole('dialog', { name: /^Create column$/ })).toBeVisible({
+		timeout: 10000,
+	})
 	await expect(page.locator('[data-cy="columnTypeFormInput"]')).toBeVisible()
 }
 
@@ -422,7 +423,9 @@ export async function loadContext(page: Page, title: string) {
 	await contextItem.scrollIntoViewIfNeeded()
 	const contextLink = contextItem.locator('a').first()
 	await navigateViaNavLink(page, contextLink)
-	await expect(page.locator('.icon-loading').first()).toBeHidden()
+	await expect(
+		page.locator('h1').filter({ hasText: new RegExp(`^${escapeRegExp(title)}$`) }).first(),
+	).toBeVisible({ timeout: 15000 })
 }
 
 export async function unifiedSearch(page: Page, term: string) {

src/modules/main/sections/EmptyTable.vue

@@ -9,7 +9,7 @@
 			{{ table.emoji }}
 		</template>
 		<template v-if="canManageTable(table)" #action>
-			<NcButton :aria-label="t('table', 'Create column')" type="primary" @click="createColumn()">
+			<NcButton data-cy="emptyTableCreateColumnBtn" :aria-label="t('table', 'Create column')" type="primary" @click="createColumn()">
 				{{ t('tables', 'Create column') }}
 			</NcButton>
 		</template>

src/modules/modals/EditRow.vue

@@ -34,11 +34,12 @@
 			</div>
 
 			<div v-if="activeTabId === 'edit'" class="row">
-				<div v-for="column in nonMetaColumns" :key="column.id">
+				<div v-for="column in nonMetaColumns" :key="column.id" :data-cy="column.title">
 					<ColumnFormComponent
 						:column="column"
 						:value.sync="localRow[column.id]" />
 					<NcNoteCard v-if="isMandatory(column) && !isValueValidForColumn(localRow[column.id], column)"
+						data-cy="rowMandatoryError"
 						type="error">
 						{{ t('tables', '"{columnTitle}" should not be empty', { columnTitle: column.title }) }}
 					</NcNoteCard>