trigger playwright tests

Untitled-1.txt

@@ -0,0 +1 @@
+.

src/Explorer/Controls/Settings/SettingsSubComponents/ComputedPropertiesComponent.tsx

@@ -155,12 +155,7 @@ export class ComputedPropertiesComponent extends React.Component<
           </Link>
           &#160; about how to define computed properties and how to use them.
         </Text>
-        <div
+        <div className="settingsV2Editor" tabIndex={0} ref={this.computedPropertiesDiv}></div>
-          className="settingsV2Editor"
-          tabIndex={0}
-          ref={this.computedPropertiesDiv}
-          data-test="computed-properties-editor"
-        ></div>
       </Stack>
     );
   }

src/Explorer/Controls/Settings/SettingsSubComponents/SubSettingsComponent.tsx

@@ -302,8 +302,8 @@ export class SubSettingsComponent extends React.Component<SubSettingsComponentPr
   );
 
   private geoSpatialConfigTypeChoiceGroupOptions: IChoiceGroupOption[] = [
-    { key: GeospatialConfigType.Geography, text: "Geography", ariaLabel: "geography-option" },
+    { key: GeospatialConfigType.Geography, text: "Geography" },
-    { key: GeospatialConfigType.Geometry, text: "Geometry", ariaLabel: "geometry-option" },
+    { key: GeospatialConfigType.Geometry, text: "Geometry" },
   ];
 
   private getGeoSpatialComponent = (): JSX.Element => (

src/Explorer/Controls/Settings/SettingsSubComponents/__snapshots__/ComputedPropertiesComponent.test.tsx.snap

@@ -31,7 +31,6 @@ exports[`ComputedPropertiesComponent renders 1`] = `
   </Text>
   <div
     className="settingsV2Editor"
-    data-test="computed-properties-editor"
     tabIndex={0}
   />
 </Stack>

src/Explorer/Controls/Settings/SettingsSubComponents/__snapshots__/SubSettingsComponent.test.tsx.snap

@@ -167,12 +167,10 @@ exports[`SubSettingsComponent analyticalTimeToLive hidden 1`] = `
     options={
       [
         {
-          "ariaLabel": "geography-option",
           "key": "Geography",
           "text": "Geography",
         },
         {
-          "ariaLabel": "geometry-option",
           "key": "Geometry",
           "text": "Geometry",
         },
@@ -654,12 +652,10 @@ exports[`SubSettingsComponent analyticalTimeToLiveSeconds hidden 1`] = `
     options={
       [
         {
-          "ariaLabel": "geography-option",
           "key": "Geography",
           "text": "Geography",
         },
         {
-          "ariaLabel": "geometry-option",
           "key": "Geometry",
           "text": "Geometry",
         },
@@ -1228,12 +1224,10 @@ exports[`SubSettingsComponent changeFeedPolicy hidden 1`] = `
     options={
       [
         {
-          "ariaLabel": "geography-option",
           "key": "Geography",
           "text": "Geography",
         },
         {
-          "ariaLabel": "geometry-option",
           "key": "Geometry",
           "text": "Geometry",
         },
@@ -1766,12 +1760,10 @@ exports[`SubSettingsComponent renders 1`] = `
     options={
       [
         {
-          "ariaLabel": "geography-option",
           "key": "Geography",
           "text": "Geography",
         },
         {
-          "ariaLabel": "geometry-option",
           "key": "Geometry",
           "text": "Geometry",
         },
@@ -2338,12 +2330,10 @@ exports[`SubSettingsComponent timeToLiveSeconds hidden 1`] = `
     options={
       [
         {
-          "ariaLabel": "geography-option",
           "key": "Geography",
           "text": "Geography",
         },
         {
-          "ariaLabel": "geometry-option",
           "key": "Geometry",
           "text": "Geometry",
         },

src/Explorer/Panes/UploadItemsPane/UploadItemsPane.tsx

@@ -205,7 +205,7 @@ export const UploadItemsPane: FunctionComponent<UploadItemsPaneProps> = ({ onUpl
           tooltip="Select one or more JSON files to upload. Each file can contain a single JSON document or an array of JSON documents. The combined size of all files in an individual upload operation must be less than 2 MB. You can perform multiple upload operations for larger data sets."
         />
         {uploadFileData?.length > 0 && (
-          <div className="fileUploadSummaryContainer" data-test="file-upload-status">
+          <div className="fileUploadSummaryContainer">
             <b style={{ color: "var(--colorNeutralForeground1)" }}>File upload status</b>
             <DetailsList
               items={uploadFileData}

test/fx.ts

@@ -326,7 +326,6 @@ type PanelOpenOptions = {
 export enum CommandBarButton {
   Save = "Save",
   ExecuteQuery = "Execute Query",
-  UploadItem = "Upload Item",
 }
 
 /** Helper class that provides locator methods for DataExplorer components, on top of a Frame */

test/sql/document.spec.ts

@@ -1,17 +1,7 @@
 import { expect, test } from "@playwright/test";
 
-import { existsSync, unlinkSync, writeFileSync } from "fs";
+import { DataExplorer, DocumentsTab, TestAccount } from "../fx";
-import path from "path";
+import { retry, setPartitionKeys } from "../testData";
-import { CommandBarButton, DataExplorer, DocumentsTab, ONE_MINUTE_MS, TestAccount } from "../fx";
-import {
-  createTestSQLContainer,
-  itemsPerPartition,
-  partitionCount,
-  retry,
-  setPartitionKeys,
-  TestContainerContext,
-  TestData,
-} from "../testData";
 import { documentTestCases } from "./testCases";
 
 let explorer: DataExplorer = null!;
@@ -105,108 +95,3 @@ for (const { name, databaseId, containerId, documents } of documentTestCases) {
     }
   });
 }
-
-test.describe.serial("Upload Item", () => {
-  let context: TestContainerContext = null!;
-  const uploadDocumentFilePath: string = path.join(__dirname, "uploadDocument.json");
-
-  test.beforeEach("Create Test Database and Open documents tab", async ({ page }) => {
-    context = await createTestSQLContainer();
-    explorer = await DataExplorer.open(page, TestAccount.SQL);
-
-    const containerNode = await explorer.waitForContainerNode(context.database.id, context.container.id);
-    await containerNode.expand();
-
-    const containerMenuNode = await explorer.waitForContainerItemsNode(context.database.id, context.container.id);
-    await containerMenuNode.element.click();
-  });
-
-  test.afterEach("Delete Test Database and uploadDocument.json", async () => {
-    if (existsSync(uploadDocumentFilePath)) {
-      unlinkSync(uploadDocumentFilePath);
-    }
-    await context?.dispose();
-  });
-
-  test("upload document", async () => {
-    // Create file to upload
-    const TestDataJsonString: string = JSON.stringify(TestData, null, 2);
-    writeFileSync(uploadDocumentFilePath, TestDataJsonString);
-
-    const uploadItemCommandBar = explorer.commandBarButton(CommandBarButton.UploadItem);
-    await uploadItemCommandBar.click();
-
-    // Select file to upload
-    await explorer.frame.setInputFiles("#importFileInput", uploadDocumentFilePath);
-
-    const uploadButton = explorer.frame.getByTestId("Panel/OkButton");
-    await uploadButton.click();
-
-    // Verify upload success message
-    const fileUploadStatusExpected: string = `${partitionCount * itemsPerPartition} created, 0 throttled, 0 errors`;
-    const fileUploadStatus = explorer.frame.getByTestId("file-upload-status");
-    await expect(fileUploadStatus).toContainText(fileUploadStatusExpected, {
-      timeout: ONE_MINUTE_MS,
-    });
-  });
-
-  test("upload same document twice", async () => {
-    // Create file to upload
-    const TestDataJsonString: string = JSON.stringify(TestData, null, 2);
-    writeFileSync(uploadDocumentFilePath, TestDataJsonString);
-
-    const uploadItemCommandBar = explorer.commandBarButton(CommandBarButton.UploadItem);
-    await uploadItemCommandBar.click();
-
-    // Select file to upload
-    await explorer.frame.setInputFiles("#importFileInput", uploadDocumentFilePath);
-
-    const uploadButton = explorer.frame.getByTestId("Panel/OkButton");
-    await uploadButton.click();
-
-    // Verify upload success message
-    const fileUploadStatusExpected: string = `${partitionCount * itemsPerPartition} created, 0 throttled, 0 errors`;
-    const fileUploadStatus = explorer.frame.getByTestId("file-upload-status");
-    await expect(fileUploadStatus).toContainText(fileUploadStatusExpected, {
-      timeout: ONE_MINUTE_MS,
-    });
-
-    // Select file to upload again
-    await explorer.frame.setInputFiles("#importFileInput", uploadDocumentFilePath);
-    await uploadButton.click();
-
-    // Verify upload failure message
-    const errorIcon = explorer.frame.getByRole("img", { name: "error" });
-    await expect(errorIcon).toBeVisible({ timeout: ONE_MINUTE_MS });
-    await expect(fileUploadStatus).toContainText(
-      `0 created, 0 throttled, ${partitionCount * itemsPerPartition} errors`,
-      {
-        timeout: ONE_MINUTE_MS,
-      },
-    );
-  });
-
-  test("upload invalid json", async () => {
-    // Create file to upload
-    let TestDataJsonString: string = JSON.stringify(TestData, null, 2);
-    // Remove the first '[' so that it becomes invalid json
-    TestDataJsonString = TestDataJsonString.substring(1);
-    writeFileSync(uploadDocumentFilePath, TestDataJsonString);
-
-    const uploadItemCommandBar = explorer.commandBarButton(CommandBarButton.UploadItem);
-    await uploadItemCommandBar.click();
-
-    // Select file to upload
-    await explorer.frame.setInputFiles("#importFileInput", uploadDocumentFilePath);
-
-    const uploadButton = explorer.frame.getByTestId("Panel/OkButton");
-    await uploadButton.click();
-
-    // Verify upload failure message
-    const fileUploadStatusExpected: string = "Unexpected non-whitespace character after JSON";
-    const fileUploadErrorList = explorer.frame.getByLabel("error list");
-    await expect(fileUploadErrorList).toContainText(fileUploadStatusExpected, {
-      timeout: ONE_MINUTE_MS,
-    });
-  });
-});

test/sql/scaleAndSettings/computedProperties.spec.ts

@@ -1,103 +0,0 @@
-import { expect, test } from "@playwright/test";
-import * as DataModels from "../../../src/Contracts/DataModels";
-import { CommandBarButton, DataExplorer, ONE_MINUTE_MS, TestAccount } from "../../fx";
-import { createTestSQLContainer, TestContainerContext } from "../../testData";
-
-test.describe("Computed Properties", () => {
-  let context: TestContainerContext = null!;
-  let explorer: DataExplorer = null!;
-
-  test.beforeAll("Create Test Database", async () => {
-    context = await createTestSQLContainer(true);
-  });
-
-  test.beforeEach("Open Settings tab under Scale & Settings", async ({ page }) => {
-    explorer = await DataExplorer.open(page, TestAccount.SQL);
-    const containerNode = await explorer.waitForContainerNode(context.database.id, context.container.id);
-    await containerNode.expand();
-
-    // Click Scale & Settings and open Settings tab
-    await explorer.openScaleAndSettings(context);
-    const computedPropertiesTab = explorer.frame.getByTestId("settings-tab-header/ComputedPropertiesTab");
-    await computedPropertiesTab.click();
-  });
-
-  test.afterAll("Delete Test Database", async () => {
-    await context?.dispose();
-  });
-
-  test("Add valid computed property", async ({ page }) => {
-    await clearComputedPropertiesTextBoxContent({ page });
-
-    // Create computed property
-    const computedProperties: DataModels.ComputedProperties = [
-      {
-        name: "cp_lowerName",
-        query: "SELECT VALUE LOWER(c.name) FROM c",
-      },
-    ];
-    const computedPropertiesString: string = JSON.stringify(computedProperties);
-    await page.keyboard.type(computedPropertiesString);
-
-    // Save changes
-    const saveButton = explorer.commandBarButton(CommandBarButton.Save);
-    await expect(saveButton).toBeEnabled();
-    await saveButton.click();
-    await expect(explorer.getConsoleMessage()).toContainText(`Successfully updated container ${context.container.id}`, {
-      timeout: ONE_MINUTE_MS,
-    });
-  });
-
-  test("Add computed property with invalid query", async ({ page }) => {
-    await clearComputedPropertiesTextBoxContent({ page });
-
-    // Create computed property with no VALUE keyword in query
-    const computedProperties: DataModels.ComputedProperties = [
-      {
-        name: "cp_lowerName",
-        query: "SELECT LOWER(c.name) FROM c",
-      },
-    ];
-    const computedPropertiesString: string = JSON.stringify(computedProperties);
-    await page.keyboard.type(computedPropertiesString);
-
-    // Save changes
-    const saveButton = explorer.commandBarButton(CommandBarButton.Save);
-    await expect(saveButton).toBeEnabled();
-    await saveButton.click();
-    await expect(explorer.getConsoleMessage()).toContainText(`Failed to update container ${context.container.id}`, {
-      timeout: ONE_MINUTE_MS,
-    });
-  });
-
-  test("Add computed property with invalid json", async ({ page }) => {
-    await clearComputedPropertiesTextBoxContent({ page });
-
-    // Create computed property with no VALUE keyword in query
-    const computedProperties: DataModels.ComputedProperties = [
-      {
-        name: "cp_lowerName",
-        query: "SELECT LOWER(c.name) FROM c",
-      },
-    ];
-    const computedPropertiesString: string = JSON.stringify(computedProperties);
-    await page.keyboard.type(computedPropertiesString + "]");
-
-    // Save button should remain disabled due to invalid json
-    const saveButton = explorer.commandBarButton(CommandBarButton.Save);
-    await expect(saveButton).toBeDisabled();
-  });
-
-  const clearComputedPropertiesTextBoxContent = async ({ page }): Promise<void> => {
-    // Get computed properties text box
-    const computedPropertiesTextBox = explorer.frame.getByRole("textbox", { name: "Computed properties" });
-    await computedPropertiesTextBox.waitFor();
-    const computedPropertiesEditor = explorer.frame.getByTestId("computed-properties-editor");
-    await computedPropertiesEditor.click();
-
-    // Clear existing content
-    const isMac: boolean = process.platform === "darwin";
-    await page.keyboard.press(isMac ? "Meta+A" : "Control+A");
-    await page.keyboard.press("Backspace");
-  };
-});

test/sql/scaleAndSettings/settings.spec.ts

@@ -15,7 +15,7 @@ test.describe("Settings under Scale & Settings", () => {
     const containerNode = await explorer.waitForContainerNode(context.database.id, context.container.id);
     await containerNode.expand();
 
-    // Click Scale & Settings and open Settings tab
+    // Click Scale & Settings and open Scale tab
     await explorer.openScaleAndSettings(context);
     const settingsTab = explorer.frame.getByTestId("settings-tab-header/SubSettingsTab");
     await settingsTab.click();
@@ -25,86 +25,46 @@ test.describe("Settings under Scale & Settings", () => {
     await context?.dispose();
   });
 
-  test.describe("Set TTL", () => {
+  test("Update TTL to On (no default)", async () => {
-    test("Update TTL to On (no default)", async () => {
+    const ttlOnNoDefaultRadioButton = explorer.frame.getByRole("radio", { name: "ttl-on-no-default-option" });
-      const ttlOnNoDefaultRadioButton = explorer.frame.getByRole("radio", { name: "ttl-on-no-default-option" });
+    await ttlOnNoDefaultRadioButton.click();
-      await ttlOnNoDefaultRadioButton.click();
 
-      await explorer.commandBarButton(CommandBarButton.Save).click();
+    await explorer.commandBarButton(CommandBarButton.Save).click();
-      await expect(explorer.getConsoleMessage()).toContainText(
+    await expect(explorer.getConsoleMessage()).toContainText(`Successfully updated container ${context.container.id}`, {
-        `Successfully updated container ${context.container.id}`,
+      timeout: ONE_MINUTE_MS,
-        {
-          timeout: ONE_MINUTE_MS,
-        },
-      );
-    });
-
-    test("Update TTL to On (with user entry)", async () => {
-      const ttlOnRadioButton = explorer.frame.getByRole("radio", { name: "ttl-on-option" });
-      await ttlOnRadioButton.click();
-
-      // Enter TTL seconds
-      const ttlInput = explorer.frame.getByTestId("ttl-input");
-      await ttlInput.fill("30000");
-
-      await explorer.commandBarButton(CommandBarButton.Save).click();
-      await expect(explorer.getConsoleMessage()).toContainText(
-        `Successfully updated container ${context.container.id}`,
-        {
-          timeout: ONE_MINUTE_MS,
-        },
-      );
-    });
-
-    test("Update TTL to Off", async () => {
-      // By default TTL is set to off so we need to first set it to On
-      const ttlOnNoDefaultRadioButton = explorer.frame.getByRole("radio", { name: "ttl-on-no-default-option" });
-      await ttlOnNoDefaultRadioButton.click();
-      await explorer.commandBarButton(CommandBarButton.Save).click();
-      await expect(explorer.getConsoleMessage()).toContainText(
-        `Successfully updated container ${context.container.id}`,
-        {
-          timeout: ONE_MINUTE_MS,
-        },
-      );
-
-      // Set it to Off
-      const ttlOffRadioButton = explorer.frame.getByRole("radio", { name: "ttl-off-option" });
-      await ttlOffRadioButton.click();
-
-      await explorer.commandBarButton(CommandBarButton.Save).click();
-      await expect(explorer.getConsoleMessage()).toContainText(
-        `Successfully updated container ${context.container.id}`,
-        {
-          timeout: ONE_MINUTE_MS,
-        },
-      );
     });
   });
 
-  test.describe("Set Geospatial Config", () => {
+  test("Update TTL to On (with user entry)", async () => {
-    test("Set Geospatial Config to Geometry then Geography", async () => {
+    const ttlOnRadioButton = explorer.frame.getByRole("radio", { name: "ttl-on-option" });
-      const geometryRadioButton = explorer.frame.getByRole("radio", { name: "geometry-option" });
+    await ttlOnRadioButton.click();
-      await geometryRadioButton.click();
 
-      await explorer.commandBarButton(CommandBarButton.Save).click();
+    // Enter TTL seconds
-      await expect(explorer.getConsoleMessage()).toContainText(
+    const ttlInput = explorer.frame.getByTestId("ttl-input");
-        `Successfully updated container ${context.container.id}`,
+    await ttlInput.fill("30000");
-        {
-          timeout: ONE_MINUTE_MS,
-        },
-      );
 
-      const geographyRadioButton = explorer.frame.getByRole("radio", { name: "geography-option" });
+    await explorer.commandBarButton(CommandBarButton.Save).click();
-      await geographyRadioButton.click();
+    await expect(explorer.getConsoleMessage()).toContainText(`Successfully updated container ${context.container.id}`, {
+      timeout: ONE_MINUTE_MS,
+    });
+  });
 
-      await explorer.commandBarButton(CommandBarButton.Save).click();
+  test("Update TTL to Off", async () => {
-      await expect(explorer.getConsoleMessage()).toContainText(
+    // By default TTL is set to off so we need to first set it to On
-        `Successfully updated container ${context.container.id}`,
+    const ttlOnNoDefaultRadioButton = explorer.frame.getByRole("radio", { name: "ttl-on-no-default-option" });
-        {
+    await ttlOnNoDefaultRadioButton.click();
-          timeout: ONE_MINUTE_MS,
+    await explorer.commandBarButton(CommandBarButton.Save).click();
-        },
+    await expect(explorer.getConsoleMessage()).toContainText(`Successfully updated container ${context.container.id}`, {
-      );
+      timeout: ONE_MINUTE_MS,
+    });
+
+    // Set it to Off
+    const ttlOffRadioButton = explorer.frame.getByRole("radio", { name: "ttl-off-option" });
+    await ttlOffRadioButton.click();
+
+    await explorer.commandBarButton(CommandBarButton.Save).click();
+    await expect(explorer.getConsoleMessage()).toContainText(`Successfully updated container ${context.container.id}`, {
+      timeout: ONE_MINUTE_MS,
     });
   });
 });

test/testData.ts

@@ -37,35 +37,27 @@ export interface PartitionKey {
   value: string | null;
 }
 
-export const partitionCount = 4;
+const partitionCount = 4;
 
 // If we increase this number, we need to split bulk creates into multiple batches.
 // Bulk operations are limited to 100 items per partition.
-export const itemsPerPartition = 100;
+const itemsPerPartition = 100;
 
 function createTestItems(): TestItem[] {
   const items: TestItem[] = [];
   for (let i = 0; i < partitionCount; i++) {
     for (let j = 0; j < itemsPerPartition; j++) {
-      const id = createSafeRandomString(32);
+      const id = crypto.randomBytes(32).toString("base64");
       items.push({
         id,
         partitionKey: `partition_${i}`,
-        randomData: createSafeRandomString(32),
+        randomData: crypto.randomBytes(32).toString("base64"),
       });
     }
   }
   return items;
 }
 
-// Document IDs cannot contain '/', '\', or '#'
-function createSafeRandomString(byteLength: number): string {
-  return crypto
-    .randomBytes(byteLength)
-    .toString("base64")
-    .replace(/[/\\#]/g, "_");
-}
-
 export const TestData: TestItem[] = createTestItems();
 
 export class TestContainerContext {