nit test uid fix

This commit is contained in:
Diego Imbert
2026-01-09 12:37:43 +01:00
parent 63afc26f96
commit bc765b636f
4 changed files with 79 additions and 95 deletions
-82
View File
@@ -1,82 +0,0 @@
import test, { expect, Page } from '@playwright/test'
import { Toast } from './utils'
test('setup a datatable', async ({ page }) => {
if (!process.env.TEST_UNIQUE_ID) throw new Error('TEST_UNIQUE_ID was not generated')
await setupNewDataTable(page, `datatable_${process.env.TEST_UNIQUE_ID}`)
})
// This saves the datatable settings which will create race conditions with other tests
async function setupNewDataTable(page: Page, datatableId: string) {
// Navigate to workspace settings data tables tab
await page.goto('/workspace_settings?tab=windmill_data_tables')
// Check if datatable already exists
let table = page.locator('table')
await table.waitFor({ state: 'visible' })
let rows = await table.locator('tr:has(input[id="name"])').all()
for (const row of rows) {
const val = await row.locator('input[id="name"]').inputValue()
if (val === datatableId) return // Don't setup again if it already exists
}
// Click on 'New Data Table' button
const newDataTableButton = page.locator('button:has-text("New Data Table")')
await newDataTableButton.click()
// Find the second-to-last row in the table (last row contains the button)
const lastRow = table.locator('tr').nth(-2)
// Fill the name input with generated ID
const nameInput = lastRow.locator('input[id="name"]')
await nameInput.fill(datatableId)
// Verify database type is 'Instance'
const databaseTypeSelect = lastRow.locator('input[id="database-type-select"]')
await expect(databaseTypeSelect).toHaveValue('Instance')
// Click on custom instance DB select and add new database
const customInstanceDbSelect = lastRow.locator('input[id="custom-instance-db-select"]')
await customInstanceDbSelect.waitFor({ state: 'visible' })
await customInstanceDbSelect.click()
await customInstanceDbSelect.fill(datatableId)
// Click on the "Add new:" button
const addNewButton = page.locator(`button:has-text("Add new: ")`)
await addNewButton.waitFor({ state: 'visible' })
await addNewButton.click()
// Click on Setup button
const setupButton = lastRow.locator('button:has-text("Setup")')
await setupButton.waitFor({ state: 'visible' })
await setupButton.click()
// Wait for popover to appear and click run setup button
const runSetupButton = page.locator('button[id="run-custom-instance-db-setup-button"]')
await runSetupButton.waitFor({ state: 'visible' })
await runSetupButton.click()
const confirmBtn = page.locator('button:has-text("Setup database")')
await confirmBtn.waitFor({ state: 'visible' })
await confirmBtn.click()
// Verify success toast appears
await Toast.expectSuccess(page, 'Setup successful')
const closeModalBtn = page.locator('button[id="modal-close-button"]')
await closeModalBtn.click()
const saveBtn = page.locator('button:has-text("Save")')
await saveBtn.click()
if (await page.locator('text=Some databases are not setup').isVisible()) {
await page.locator('button:has-text("Save anyway")').click()
}
// Verify success toast appears
await Toast.expectSuccess(page, 'saved successfully')
return { datatableId }
}
declare const process: any // ignore TS errors
+75 -1
View File
@@ -1,5 +1,6 @@
import { test, Page } from '@playwright/test'
import { test, Page, expect } from '@playwright/test'
import { runDbManagerAlterTableTest, runDbManagerSimpleCRUDTest } from './DbManagerPage'
import { Toast } from './utils'
test.describe('Data tables', () => {
test('simple CRUD with DB Manager', async ({ page }) => {
@@ -14,6 +15,7 @@ test.describe('Data tables', () => {
async function openDataTableDbManager(page: Page) {
await page.goto('/workspace_settings?tab=windmill_data_tables')
await setupNewDataTable(page, `datatable_${process.env.TEST_UNIQUE_ID}`)
const datatableId = `datatable_${process.env.TEST_UNIQUE_ID}`
let table = page.locator('table')
await table.waitFor({ state: 'visible' })
@@ -29,3 +31,75 @@ async function openDataTableDbManager(page: Page) {
}
declare const process: any // ignore TS errors
async function setupNewDataTable(page: Page, datatableId: string) {
// Check if datatable already exists
let table = page.locator('table')
await table.waitFor({ state: 'visible' })
let rows = await table.locator('tr:has(input[id="name"])').all()
for (const row of rows) {
const val = await row.locator('input[id="name"]').inputValue()
// Don't setup again if it already exists.
// The reason we do not use a unique datatable per test is that saving
// the settings create a race condition when multiple tests run in parallel.
if (val === datatableId) return
}
// Click on 'New Data Table' button
const newDataTableButton = page.locator('button:has-text("New Data Table")')
await newDataTableButton.click()
// Find the second-to-last row in the table (last row contains the button)
const lastRow = table.locator('tr').nth(-2)
// Fill the name input with generated ID
const nameInput = lastRow.locator('input[id="name"]')
await nameInput.fill(datatableId)
// Verify database type is 'Instance'
const databaseTypeSelect = lastRow.locator('input[id="database-type-select"]')
await expect(databaseTypeSelect).toHaveValue('Instance')
// Click on custom instance DB select and add new database
const customInstanceDbSelect = lastRow.locator('input[id="custom-instance-db-select"]')
await customInstanceDbSelect.waitFor({ state: 'visible' })
await customInstanceDbSelect.click()
await customInstanceDbSelect.fill(datatableId)
// Click on the "Add new:" button
const addNewButton = page.locator(`button:has-text("Add new: ")`)
await addNewButton.waitFor({ state: 'visible' })
await addNewButton.click()
// Click on Setup button
const setupButton = lastRow.locator('button:has-text("Setup")')
await setupButton.waitFor({ state: 'visible' })
await setupButton.click()
// Wait for popover to appear and click run setup button
const runSetupButton = page.locator('button[id="run-custom-instance-db-setup-button"]')
await runSetupButton.waitFor({ state: 'visible' })
await runSetupButton.click()
const confirmBtn = page.locator('button:has-text("Setup database")')
await confirmBtn.waitFor({ state: 'visible' })
await confirmBtn.click()
// Verify success toast appears
await Toast.expectSuccess(page, 'Setup successful')
const closeModalBtn = page.locator('button[id="modal-close-button"]')
await closeModalBtn.click()
const saveBtn = page.locator('button:has-text("Save")')
await saveBtn.click()
if (await page.locator('text=Some databases are not setup').isVisible()) {
await page.locator('button:has-text("Save anyway")').click()
}
// Verify success toast appears
await Toast.expectSuccess(page, 'saved successfully')
return { datatableId }
}
+1 -2
View File
@@ -54,7 +54,7 @@ async function setupNewResource(
resourceType: DbType
): Promise<{ resourceName: string }> {
// Generate unique ID with timestamp
const resourceName = `${resourceType}_${process.env.TEST_UNIQUE_ID}`
const resourceName = `${resourceType}_${Date.now()}`
await page.goto('/resources')
@@ -99,4 +99,3 @@ async function setupNewResourceAndOpenDbManager(page: Page, dbType: DbType) {
const manageButton = resourceRow.locator('button:has-text("Manage")')
await manageButton.click()
}
declare const process: any // avoid TS errors
+3 -10
View File
@@ -44,24 +44,17 @@ export default defineConfig({
testMatch: /.*\.spec\.ts/,
/* Configure projects for major browsers */
projects: [
{
name: 'setup',
testMatch: /.*\.setup\.ts/
},
{
name: 'chromium',
use: { ...devices['Desktop Chrome'] },
dependencies: ['setup']
use: { ...devices['Desktop Chrome'] }
},
{
name: 'firefox',
use: { ...devices['Desktop Firefox'] },
dependencies: ['setup']
use: { ...devices['Desktop Firefox'] }
},
{
name: 'webkit',
use: { ...devices['Desktop Safari'] },
dependencies: ['setup']
use: { ...devices['Desktop Safari'] }
}
]