-
Notifications
You must be signed in to change notification settings - Fork 16.4k
Add E2E tests for DAG audit log functionality (#59684) #59734
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
+391
−0
Merged
Changes from all commits
Commits
Show all changes
19 commits
Select commit
Hold shift + click to select a range
b2844a0
Add E2E tests for DAG audit log functionality (#59684)
haseebmalik18 4cdcbad
Merge branch 'main' into main
vatsrahul1001 66f1251
Add E2E tests for DAG audit log functionality #59684
haseebmalik18 9df2836
Merge branch 'main' into main
haseebmalik18 4604abf
Merge branch 'main' into main
vatsrahul1001 3dbc6fc
Add E2E tests for DAG audit log functionality #59684
haseebmalik18 26b0de8
Merge branch 'main' of https://github.com/haseebmalik18/airflow
haseebmalik18 e070948
Merge branch 'main' into main
vatsrahul1001 55b8d71
Add E2E tests for DAG audit log functionality #59684
haseebmalik18 834fba1
Add E2E tests for DAG audit log functionality #59684
haseebmalik18 ec2bf04
Add E2E tests for DAG audit log functionality #59684
haseebmalik18 40853ed
Add E2E tests for DAG audit log functionality #59684
haseebmalik18 0b91e49
Add E2E tests for DAG audit log functionality #59684
haseebmalik18 09d1239
Merge branch 'main' into main
vatsrahul1001 9a59687
Add E2E tests for DAG audit log functionality #59684
haseebmalik18 cf2dd57
Merge branch 'main' of https://github.com/haseebmalik18/airflow
haseebmalik18 df4870d
Merge branch 'main' into main
vatsrahul1001 e5a3d49
Add E2E tests for DAG audit log functionality #59684
haseebmalik18 f74fc4d
Merge branch 'main' into main
vatsrahul1001 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
230 changes: 230 additions & 0 deletions
230
airflow-core/src/airflow/ui/tests/e2e/pages/EventsPage.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,230 @@ | ||
| /*! | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
| import type { Locator, Page } from "@playwright/test"; | ||
| import { BasePage } from "tests/e2e/pages/BasePage"; | ||
|
|
||
| export class EventsPage extends BasePage { | ||
| public readonly eventColumn: Locator; | ||
| public readonly eventsTable: Locator; | ||
| public readonly extraColumn: Locator; | ||
| public readonly ownerColumn: Locator; | ||
| public readonly paginationNextButton: Locator; | ||
| public readonly paginationPrevButton: Locator; | ||
| public readonly tableRows: Locator; | ||
| public readonly whenColumn: Locator; | ||
|
|
||
| private currentDagId?: string; | ||
| private currentLimit?: number; | ||
|
|
||
| public constructor(page: Page) { | ||
| super(page); | ||
| this.eventsTable = page.locator('[data-testid="table-list"]'); | ||
| this.eventColumn = this.eventsTable.locator('th:has-text("Event")'); | ||
| this.extraColumn = this.eventsTable.locator('th:has-text("Extra")'); | ||
| this.ownerColumn = this.eventsTable.locator('th:has-text("User")'); | ||
| this.paginationNextButton = page.locator('[data-testid="next"]'); | ||
| this.paginationPrevButton = page.locator('[data-testid="prev"]'); | ||
| this.tableRows = this.eventsTable.locator("tbody tr"); | ||
| this.whenColumn = this.eventsTable.locator('th:has-text("When")'); | ||
| } | ||
|
|
||
| public static getEventsUrl(dagId: string): string { | ||
| return `/dags/${dagId}/events`; | ||
| } | ||
|
|
||
| public async clickColumnToSort(columnName: "Event" | "User" | "When"): Promise<void> { | ||
| const columnHeader = this.eventsTable.locator(`th:has-text("${columnName}")`); | ||
| const sortButton = columnHeader.locator('button[aria-label="sort"]'); | ||
|
|
||
| await sortButton.click(); | ||
| await this.waitForTableLoad(); | ||
| await this.ensureUrlParams(); | ||
| } | ||
|
|
||
| public async clickNextPage(): Promise<void> { | ||
| await this.paginationNextButton.click(); | ||
| await this.waitForTableLoad(); | ||
| await this.ensureUrlParams(); | ||
| } | ||
|
|
||
| public async clickPrevPage(): Promise<void> { | ||
| await this.paginationPrevButton.click(); | ||
| await this.waitForTableLoad(); | ||
| await this.ensureUrlParams(); | ||
| } | ||
|
|
||
| public async getCellByColumnName(row: Locator, columnName: string): Promise<Locator> { | ||
| const headers = await this.eventsTable.locator("thead th").allTextContents(); | ||
| const index = headers.findIndex((h) => h.toLowerCase().includes(columnName.toLowerCase())); | ||
|
|
||
| if (index === -1) { | ||
| throw new Error(`Column "${columnName}" not found`); | ||
| } | ||
|
|
||
| return row.locator("td").nth(index); | ||
| } | ||
|
|
||
| public async getEventLogRows(): Promise<Array<Locator>> { | ||
| const count = await this.tableRows.count(); | ||
|
|
||
| if (count === 0) { | ||
| return []; | ||
| } | ||
|
|
||
| return this.tableRows.all(); | ||
| } | ||
|
|
||
| public async getEventTypes(allPages: boolean = false): Promise<Array<string>> { | ||
| const rows = await this.getEventLogRows(); | ||
|
|
||
| if (rows.length === 0) { | ||
| return []; | ||
| } | ||
|
|
||
| const eventTypes: Array<string> = []; | ||
|
|
||
| for (const row of rows) { | ||
| const eventCell = await this.getCellByColumnName(row, "Event"); | ||
| const text = await eventCell.textContent(); | ||
|
|
||
| if (text !== null) { | ||
| eventTypes.push(text.trim()); | ||
| } | ||
| } | ||
|
|
||
| if (!allPages) { | ||
| return eventTypes; | ||
| } | ||
|
|
||
| const allEventTypes = [...eventTypes]; | ||
|
|
||
| while (await this.hasNextPage()) { | ||
| await this.clickNextPage(); | ||
| const pageEvents = await this.getEventTypes(false); | ||
|
|
||
| allEventTypes.push(...pageEvents); | ||
| } | ||
|
|
||
| while ((await this.paginationPrevButton.count()) > 0 && (await this.paginationPrevButton.isEnabled())) { | ||
| await this.clickPrevPage(); | ||
| } | ||
|
|
||
| return allEventTypes; | ||
| } | ||
|
|
||
| public async hasNextPage(): Promise<boolean> { | ||
| const count = await this.paginationNextButton.count(); | ||
|
|
||
| if (count === 0) { | ||
| return false; | ||
| } | ||
|
|
||
| return await this.paginationNextButton.isEnabled(); | ||
| } | ||
|
|
||
| public async navigateToAuditLog(dagId: string, limit?: number): Promise<void> { | ||
| this.currentDagId = dagId; | ||
| this.currentLimit = limit; | ||
|
|
||
| const baseUrl = EventsPage.getEventsUrl(dagId); | ||
| const url = limit === undefined ? baseUrl : `${baseUrl}?offset=0&limit=${limit}`; | ||
|
|
||
| await this.page.goto(url, { | ||
| timeout: 30_000, | ||
| waitUntil: "domcontentloaded", | ||
| }); | ||
| await this.waitForTableLoad(); | ||
| } | ||
|
|
||
| /** | ||
| * Wait for table to finish loading | ||
| */ | ||
| public async waitForTableLoad(): Promise<void> { | ||
| await this.eventsTable.waitFor({ state: "visible", timeout: 60_000 }); | ||
|
|
||
| await this.page.waitForFunction( | ||
| () => { | ||
| const table = document.querySelector('[data-testid="table-list"]'); | ||
|
|
||
| if (!table) { | ||
| return false; | ||
| } | ||
|
|
||
| const skeletons = table.querySelectorAll('[data-scope="skeleton"]'); | ||
|
|
||
| if (skeletons.length > 0) { | ||
| return false; | ||
| } | ||
|
|
||
| const rows = table.querySelectorAll("tbody tr"); | ||
|
|
||
| for (const row of rows) { | ||
| const cells = row.querySelectorAll("td"); | ||
| let hasContent = false; | ||
|
|
||
| for (const cell of cells) { | ||
| if (cell.textContent && cell.textContent.trim().length > 0) { | ||
| hasContent = true; | ||
| break; | ||
| } | ||
| } | ||
|
|
||
| if (!hasContent) { | ||
| return false; | ||
| } | ||
| } | ||
|
|
||
| return true; | ||
| }, | ||
| undefined, | ||
| { timeout: 60_000 }, | ||
| ); | ||
| } | ||
|
|
||
| /** | ||
| * Ensure offset=0 is present when limit is set to prevent limit from being ignored | ||
| */ | ||
| private async ensureUrlParams(): Promise<void> { | ||
| if (this.currentLimit === undefined || this.currentDagId === undefined) { | ||
| return; | ||
| } | ||
|
|
||
| const currentUrl = this.page.url(); | ||
| const url = new URL(currentUrl); | ||
| const hasLimit = url.searchParams.has("limit"); | ||
| const hasOffset = url.searchParams.has("offset"); | ||
|
|
||
| if (hasLimit && !hasOffset) { | ||
| url.searchParams.set("offset", "0"); | ||
| await this.page.goto(url.toString(), { | ||
| timeout: 30_000, | ||
| waitUntil: "domcontentloaded", | ||
| }); | ||
| await this.waitForTableLoad(); | ||
| } else if (!hasLimit && !hasOffset) { | ||
| url.searchParams.set("offset", "0"); | ||
| url.searchParams.set("limit", String(this.currentLimit)); | ||
| await this.page.goto(url.toString(), { | ||
| timeout: 30_000, | ||
| waitUntil: "domcontentloaded", | ||
| }); | ||
| await this.waitForTableLoad(); | ||
| } | ||
| } | ||
| } | ||
161 changes: 161 additions & 0 deletions
161
airflow-core/src/airflow/ui/tests/e2e/specs/dag-audit-log.spec.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,161 @@ | ||
| /*! | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
| import { expect, test } from "@playwright/test"; | ||
| import { AUTH_FILE, testConfig } from "playwright.config"; | ||
| import { DagsPage } from "tests/e2e/pages/DagsPage"; | ||
| import { EventsPage } from "tests/e2e/pages/EventsPage"; | ||
|
|
||
| test.describe("DAG Audit Log", () => { | ||
| let eventsPage: EventsPage; | ||
|
|
||
| const testDagId = testConfig.testDag.id; | ||
| const triggerCount = 3; | ||
| const expectedEventCount = triggerCount + 1; | ||
|
|
||
| test.setTimeout(60_000); | ||
|
|
||
| test.beforeAll(async ({ browser }) => { | ||
| test.setTimeout(3 * 60 * 1000); | ||
| const context = await browser.newContext({ storageState: AUTH_FILE }); | ||
| const page = await context.newPage(); | ||
| const setupDagsPage = new DagsPage(page); | ||
| const setupEventsPage = new EventsPage(page); | ||
|
|
||
| for (let i = 0; i < triggerCount; i++) { | ||
| await setupDagsPage.triggerDag(testDagId); | ||
| } | ||
|
|
||
| await setupEventsPage.navigateToAuditLog(testDagId); | ||
| await page.waitForFunction( | ||
| (minCount) => { | ||
| const table = document.querySelector('[data-testid="table-list"]'); | ||
|
|
||
| if (!table) { | ||
| return false; | ||
| } | ||
| const rows = table.querySelectorAll("tbody tr"); | ||
|
|
||
| return rows.length >= minCount; | ||
| }, | ||
| expectedEventCount, | ||
| { timeout: 60_000 }, | ||
| ); | ||
|
|
||
| await context.close(); | ||
| }); | ||
|
|
||
| test.beforeEach(({ page }) => { | ||
| eventsPage = new EventsPage(page); | ||
| }); | ||
|
|
||
| test("verify audit log table displays", async () => { | ||
| await eventsPage.navigateToAuditLog(testDagId); | ||
|
|
||
| await expect(eventsPage.eventsTable).toBeVisible(); | ||
|
|
||
| const rowCount = await eventsPage.tableRows.count(); | ||
|
|
||
| expect(rowCount).toBeGreaterThan(0); | ||
| }); | ||
|
|
||
| test("verify expected columns are visible", async () => { | ||
| await eventsPage.navigateToAuditLog(testDagId); | ||
|
|
||
| await expect(eventsPage.whenColumn).toBeVisible(); | ||
| await expect(eventsPage.eventColumn).toBeVisible(); | ||
| await expect(eventsPage.ownerColumn).toBeVisible(); | ||
| await expect(eventsPage.extraColumn).toBeVisible(); | ||
|
|
||
| const dagIdColumn = eventsPage.eventsTable.locator('th:has-text("DAG ID")'); | ||
|
|
||
| await expect(dagIdColumn).not.toBeVisible(); | ||
| }); | ||
|
|
||
| test("verify audit log entries display valid data", async () => { | ||
| await eventsPage.navigateToAuditLog(testDagId); | ||
|
|
||
| const rows = await eventsPage.getEventLogRows(); | ||
|
|
||
| expect(rows.length).toBeGreaterThan(0); | ||
|
|
||
| const [firstRow] = rows; | ||
|
|
||
| if (!firstRow) { | ||
| throw new Error("No rows found"); | ||
| } | ||
|
|
||
| const whenCell = await eventsPage.getCellByColumnName(firstRow, "When"); | ||
| const eventCell = await eventsPage.getCellByColumnName(firstRow, "Event"); | ||
| const userCell = await eventsPage.getCellByColumnName(firstRow, "User"); | ||
|
|
||
| const whenText = await whenCell.textContent(); | ||
| const eventText = await eventCell.textContent(); | ||
| const userText = await userCell.textContent(); | ||
|
|
||
| expect(whenText).toBeTruthy(); | ||
| expect(whenText?.trim()).not.toBe(""); | ||
|
|
||
| expect(eventText).toBeTruthy(); | ||
| expect(eventText?.trim()).not.toBe(""); | ||
|
|
||
| expect(userText).toBeTruthy(); | ||
| expect(userText?.trim()).not.toBe(""); | ||
| }); | ||
|
|
||
| test("verify pagination through audit log entries", async () => { | ||
| await eventsPage.navigateToAuditLog(testDagId, 3); | ||
|
|
||
| const hasNext = await eventsPage.hasNextPage(); | ||
|
|
||
| expect(hasNext).toBe(true); | ||
|
|
||
| const urlPage1 = eventsPage.page.url(); | ||
|
|
||
| expect(urlPage1).toContain("offset=0"); | ||
| expect(urlPage1).toContain("limit=3"); | ||
|
|
||
| await eventsPage.clickNextPage(); | ||
|
|
||
| const urlPage2 = eventsPage.page.url(); | ||
|
|
||
| expect(urlPage2).toContain("limit=3"); | ||
| expect(urlPage2).not.toContain("offset=0"); | ||
|
|
||
| await eventsPage.clickPrevPage(); | ||
|
|
||
| const urlBackToPage1 = eventsPage.page.url(); | ||
|
|
||
| expect(urlBackToPage1).toContain("offset=0"); | ||
| expect(urlBackToPage1).toContain("limit=3"); | ||
| }); | ||
|
|
||
| test("verify sorting when clicking column header", async () => { | ||
| await eventsPage.navigateToAuditLog(testDagId); | ||
|
|
||
| const initialEvents = await eventsPage.getEventTypes(true); | ||
|
|
||
| await eventsPage.clickColumnToSort("Event"); | ||
|
|
||
| const sortedEvents = await eventsPage.getEventTypes(true); | ||
|
|
||
| const expectedSorted = [...initialEvents].sort(); | ||
|
|
||
| expect(sortedEvents).toEqual(expectedSorted); | ||
| }); | ||
| }); |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.