From 38823ac86f5ea05bbd1e97f41c041b9fc86287b8 Mon Sep 17 00:00:00 2001 From: BChoudhury-ms Date: Thu, 8 Jan 2026 20:15:25 +0530 Subject: [PATCH] Fix change partition key FTs (#2309) --- .../changePartitionKey.spec.ts | 206 +++++++++++------- 1 file changed, 122 insertions(+), 84 deletions(-) diff --git a/test/sql/scaleAndSettings/changePartitionKey.spec.ts b/test/sql/scaleAndSettings/changePartitionKey.spec.ts index 95f5a957a..1f23d3154 100644 --- a/test/sql/scaleAndSettings/changePartitionKey.spec.ts +++ b/test/sql/scaleAndSettings/changePartitionKey.spec.ts @@ -1,104 +1,142 @@ -// import { expect, test } from "@playwright/test"; -// import { DataExplorer, getDropdownItemByNameOrPosition, TestAccount } from "../../fx"; -// import { createTestSQLContainer, TestContainerContext } from "../../testData"; +import { expect, test } from "@playwright/test"; +import { DataExplorer, TestAccount } from "../../fx"; +import { createTestSQLContainer, TestContainerContext } from "../../testData"; -// test.describe("Change Partition Key", () => { -// let context: TestContainerContext = null!; -// let explorer: DataExplorer = null!; -// const newPartitionKeyPath = "newPartitionKey"; -// const newContainerId = "testcontainer_1"; +test.describe("Change Partition Key", () => { + let context: TestContainerContext = null!; + let explorer: DataExplorer = null!; + const newPartitionKeyPath = "newPartitionKey"; + const newContainerId = "testcontainer_1"; + let previousJobName: string | undefined; -// test.beforeAll("Create Test Database", async () => { -// context = await createTestSQLContainer(); -// }); + test.beforeAll("Create Test Database", async () => { + context = await createTestSQLContainer(); + }); -// test.beforeEach("Open container settings", async ({ page }) => { -// explorer = await DataExplorer.open(page, TestAccount.SQL); + test.beforeEach("Open container settings", async ({ page }) => { + explorer = await DataExplorer.open(page, TestAccount.SQL); -// // Click Scale & Settings and open Partition Key tab -// await explorer.openScaleAndSettings(context); -// const PartitionKeyTab = explorer.frame.getByTestId("settings-tab-header/PartitionKeyTab"); -// await expect(PartitionKeyTab).toBeVisible(); -// await PartitionKeyTab.click(); -// }); + // Click Scale & Settings and open Partition Key tab + await explorer.openScaleAndSettings(context); + const PartitionKeyTab = explorer.frame.getByTestId("settings-tab-header/PartitionKeyTab"); + await expect(PartitionKeyTab).toBeVisible(); + await PartitionKeyTab.click(); + }); -// // Delete database only if not running in CI -// if (!process.env.CI) { -// test.afterEach("Delete Test Database", async () => { -// await context?.dispose(); -// }); -// } + // Delete database only if not running in CI + if (!process.env.CI) { + test.afterEach("Delete Test Database", async () => { + await context?.dispose(); + }); + } -// test("Change partition key path", async () => { -// await expect(explorer.frame.getByText("/partitionKey")).toBeVisible(); -// await expect(explorer.frame.getByText("Change partition key")).toBeVisible(); -// await expect(explorer.frame.getByText(/To safeguard the integrity of/)).toBeVisible(); -// await expect(explorer.frame.getByText(/To change the partition key/)).toBeVisible(); + test("Change partition key path", async ({ page }) => { + await expect(explorer.frame.getByText("/partitionKey")).toBeVisible(); + await expect(explorer.frame.getByText("Change partition key")).toBeVisible(); + await expect(explorer.frame.getByText(/To safeguard the integrity of/)).toBeVisible(); + await expect(explorer.frame.getByText(/To change the partition key/)).toBeVisible(); -// const changePartitionKeyButton = explorer.frame.getByTestId("change-partition-key-button"); -// expect(changePartitionKeyButton).toBeVisible(); -// await changePartitionKeyButton.click(); + const changePartitionKeyButton = explorer.frame.getByTestId("change-partition-key-button"); + expect(changePartitionKeyButton).toBeVisible(); + await changePartitionKeyButton.click(); -// // Fill out new partition key form in the panel -// const changePkPanel = explorer.frame.getByTestId(`Panel:Change partition key`); -// await expect(changePkPanel.getByText(context.database.id)).toBeVisible(); -// await expect(explorer.frame.getByRole("heading", { name: "Change partition key" })).toBeVisible(); -// await expect(explorer.frame.getByText(/When changing a container/)).toBeVisible(); + // Fill out new partition key form in the panel + const changePkPanel = explorer.frame.getByTestId(`Panel:Change partition key`); + await expect(changePkPanel.getByText(context.database.id)).toBeVisible(); + await expect(explorer.frame.getByRole("heading", { name: "Change partition key" })).toBeVisible(); + await expect(explorer.frame.getByText(/When changing a container/)).toBeVisible(); -// // Try to switch to new container -// await expect(changePkPanel.getByText("New container")).toBeVisible(); -// await expect(changePkPanel.getByText("Existing container")).toBeVisible(); -// await expect(changePkPanel.getByTestId("new-container-id-input")).toBeVisible(); + // Try to switch to new container + await expect(changePkPanel.getByText("New container")).toBeVisible(); + await expect(changePkPanel.getByText("Existing container")).toBeVisible(); + await expect(changePkPanel.getByTestId("new-container-id-input")).toBeVisible(); -// changePkPanel.getByTestId("new-container-id-input").fill(newContainerId); -// await expect(changePkPanel.getByTestId("new-container-partition-key-input")).toBeVisible(); -// changePkPanel.getByTestId("new-container-partition-key-input").fill(newPartitionKeyPath); + changePkPanel.getByTestId("new-container-id-input").fill(newContainerId); + await expect(changePkPanel.getByTestId("new-container-partition-key-input")).toBeVisible(); + changePkPanel.getByTestId("new-container-partition-key-input").fill(newPartitionKeyPath); -// await expect(changePkPanel.getByTestId("add-sub-partition-key-button")).toBeVisible(); -// changePkPanel.getByTestId("add-sub-partition-key-button").click(); -// await expect(changePkPanel.getByTestId("new-container-sub-partition-key-input-0")).toBeVisible(); -// await expect(changePkPanel.getByTestId("remove-sub-partition-key-button-0")).toBeVisible(); -// await expect(changePkPanel.getByTestId("hierarchical-partitioning-info-text")).toBeVisible(); -// await changePkPanel.getByTestId("remove-sub-partition-key-button-0").click(); + await expect(changePkPanel.getByTestId("add-sub-partition-key-button")).toBeVisible(); + changePkPanel.getByTestId("add-sub-partition-key-button").click(); + await expect(changePkPanel.getByTestId("new-container-sub-partition-key-input-0")).toBeVisible(); + await expect(changePkPanel.getByTestId("remove-sub-partition-key-button-0")).toBeVisible(); + await expect(changePkPanel.getByTestId("hierarchical-partitioning-info-text")).toBeVisible(); + await changePkPanel.getByTestId("remove-sub-partition-key-button-0").click(); -// await changePkPanel.getByTestId("Panel/OkButton").click(); + await changePkPanel.getByTestId("Panel/OkButton").click(); -// await expect(changePkPanel).not.toBeVisible({ timeout: 5 * 60 * 1000 }); + let jobName: string | undefined; + await page.waitForRequest( + (req) => { + const requestUrl = req.url(); + if (requestUrl.includes("/dataTransferJobs") && req.method() === "PUT") { + jobName = new URL(requestUrl).pathname.split("/").pop(); + return true; + } + return false; + }, + { timeout: 120000 }, + ); -// // Verify partition key change job -// const jobText = explorer.frame.getByText(/Partition key change job/); -// await expect(jobText).toBeVisible(); -// await expect(explorer.frame.locator(".ms-ProgressIndicator-itemName")).toContainText("Portal_testcontainer_1"); + await expect(changePkPanel).not.toBeVisible({ timeout: 5 * 60 * 1000 }); -// const jobRow = explorer.frame.locator(".ms-ProgressIndicator-itemDescription"); -// // await expect(jobRow.getByText("Pending")).toBeVisible({ timeout: 30 * 1000 }); -// await expect(jobRow.getByText("Completed")).toBeVisible({ timeout: 5 * 60 * 1000 }); + // Verify partition key change job + const jobText = explorer.frame.getByText(/Partition key change job/); + await expect(jobText).toBeVisible(); + // await expect(explorer.frame.locator(".ms-ProgressIndicator-itemName")).toContainText("Portal_testcontainer_1"); + await expect(explorer.frame.locator(".ms-ProgressIndicator-itemName")).toContainText(jobName!); -// const newContainerNode = await explorer.waitForContainerNode(context.database.id, newContainerId); -// expect(newContainerNode).not.toBeNull(); + const jobRow = explorer.frame.locator(".ms-ProgressIndicator-itemDescription"); + // await expect(jobRow.getByText("Pending")).toBeVisible({ timeout: 30 * 1000 }); + await expect(jobRow.getByText("Completed")).toBeVisible({ timeout: 5 * 60 * 1000 }); -// // Now try to switch to existing container -// await changePartitionKeyButton.click(); -// await changePkPanel.getByText("Existing container").click(); -// await changePkPanel.getByLabel("Use existing container").check(); -// await changePkPanel.getByText("Choose an existing container").click(); + const newContainerNode = await explorer.waitForContainerNode(context.database.id, newContainerId); + expect(newContainerNode).not.toBeNull(); -// const containerDropdownItem = await getDropdownItemByNameOrPosition( -// explorer.frame, -// { name: newContainerId }, -// { ariaLabel: "Existing Containers" }, -// ); -// await containerDropdownItem.click(); + // Now try to switch to existing container + // Ensure this job name is different from the previously processed job name + previousJobName = jobName; -// await changePkPanel.getByTestId("Panel/OkButton").click(); -// await explorer.frame.getByRole("button", { name: "Cancel" }).click(); + await changePartitionKeyButton.click(); + await changePkPanel.getByText("Existing container").click(); + await changePkPanel.getByLabel("Use existing container").check(); + await changePkPanel.getByText("Choose an existing container").click(); -// // Dismiss overlay if it appears -// const overlayFrame = explorer.frame.locator("#webpack-dev-server-client-overlay").first(); -// if (await overlayFrame.count()) { -// await overlayFrame.contentFrame().getByLabel("Dismiss").click(); -// } -// const cancelledJobRow = explorer.frame.getByTestId("Tab:tab0"); -// await expect(cancelledJobRow.getByText("Cancelled")).toBeVisible({ timeout: 30 * 1000 }); -// }); -// }); + const containerDropdownItem = await explorer.getDropdownItemByName(newContainerId, "Existing Containers"); + await containerDropdownItem.click(); + + let secondJobName: string | undefined; + await Promise.all([ + page.waitForRequest( + (req) => { + const requestUrl = req.url(); + if (requestUrl.includes("/dataTransferJobs") && req.method() === "PUT") { + secondJobName = new URL(requestUrl).pathname.split("/").pop(); + return true; + } + return false; + }, + { timeout: 120000 }, + ), + changePkPanel.getByTestId("Panel/OkButton").click(), + ]); + + const cancelButton = explorer.frame.getByRole("button", { name: "Cancel" }); + const isCancelButtonVisible = await cancelButton.isVisible().catch(() => false); + if (isCancelButtonVisible) { + await cancelButton.click(); + + // Dismiss overlay if it appears + const overlayFrame = explorer.frame.locator("#webpack-dev-server-client-overlay").first(); + if (await overlayFrame.count()) { + await overlayFrame.contentFrame().getByLabel("Dismiss").click(); + } + + const cancelledJobRow = explorer.frame.getByTestId("Tab:tab0"); + await expect(cancelledJobRow.getByText("Cancelled")).toBeVisible({ timeout: 30 * 1000 }); + } else { + const jobRow = explorer.frame.locator(".ms-ProgressIndicator-itemDescription"); + await expect(jobRow.getByText("Completed")).toBeVisible({ timeout: 5 * 60 * 1000 }); + expect(secondJobName).not.toBe(previousJobName); + } + }); +});