Revert "[WIP] Fix e2e tests (#1812)"

misha-db · misha-db · commit 43ff794d228e · 2026-03-16T20:47:22.000+04:00
This reverts commit f468d9f.
diff --git a/packages/databricks-vscode/src/test/e2e/auth.e2e.ts b/packages/databricks-vscode/src/test/e2e/auth.e2e.ts
@@ -1,7 +1,6 @@
 import assert from "node:assert";
 import {
     dismissNotifications,
-    getActionButton,
     waitForInput,
     getViewSection,
     waitForLogin,
@@ -71,12 +70,8 @@ describe("Configure Databricks Extension", async function () {
                 const items = await section.getVisibleItems();
                 for (const item of items) {
                     const label = await item.getLabel();
-                    console.log(
-                        "Looking for signin button, got item:",
-                        await (await item.elem).getHTML()
-                    );
                     if (label.toLowerCase().includes("auth type")) {
-                        return getActionButton(item, "Sign in");
+                        return item.getActionButton("Sign in");
                     }
                 }
             },
diff --git a/packages/databricks-vscode/src/test/e2e/deploy_and_run_job.e2e.ts b/packages/databricks-vscode/src/test/e2e/deploy_and_run_job.e2e.ts
@@ -1,10 +1,8 @@
 import assert from "node:assert";
 import {
     dismissNotifications,
-    getActionButton,
     getUniqueResourceName,
     getViewSection,
-    selectOutputChannel,
     waitForDeployment,
     waitForLogin,
     waitForTreeItems,
@@ -67,7 +65,7 @@ describe("Deploy and run job", async function () {
 
     it("should deploy and run the current job", async () => {
         const outputView = await workbench.getBottomBar().openOutputView();
-        await selectOutputChannel(outputView, "Databricks Bundle Logs");
+        await outputView.selectChannel("Databricks Bundle Logs");
         await outputView.clearText();
 
         const jobItem = await getResourceViewItem(
@@ -77,8 +75,7 @@ describe("Deploy and run job", async function () {
         );
         assert(jobItem, `Job ${jobName} not found in resource explorer`);
 
-        const deployAndRunButton = await getActionButton(
-            jobItem,
+        const deployAndRunButton = await jobItem.getActionButton(
             "Deploy the bundle and run the job"
         );
         assert(deployAndRunButton, "Deploy and run button not found");
diff --git a/packages/databricks-vscode/src/test/e2e/deploy_and_run_pipeline.e2e.ts b/packages/databricks-vscode/src/test/e2e/deploy_and_run_pipeline.e2e.ts
@@ -1,9 +1,7 @@
 import assert from "node:assert";
 import {
     dismissNotifications,
-    getActionButton,
     getViewSection,
-    selectOutputChannel,
     waitForDeployment,
     waitForLogin,
     waitForTreeItems,
@@ -64,7 +62,7 @@ describe("Deploy and run pipeline", async function () {
 
     it("should deploy and run the current pipeline", async () => {
         const outputView = await workbench.getBottomBar().openOutputView();
-        await selectOutputChannel(outputView, "Databricks Bundle Logs");
+        await outputView.selectChannel("Databricks Bundle Logs");
         await outputView.clearText();
 
         const pipelineItem = await getResourceViewItem(
@@ -77,14 +75,13 @@ describe("Deploy and run pipeline", async function () {
             `Pipeline ${pipelineName} not found in resource explorer`
         );
 
-        const deployAndRunButton = await getActionButton(
-            pipelineItem,
+        const deployAndRunButton = await pipelineItem.getActionButton(
             "Deploy the bundle and run the pipeline"
         );
         assert(deployAndRunButton, "Deploy and run button not found");
         await deployAndRunButton.elem.click();
 
-        await waitForDeployment(outputView);
+        await waitForDeployment();
 
         await waitForRunStatus(
             resourceExplorerView,
diff --git a/packages/databricks-vscode/src/test/e2e/destroy.e2e.ts b/packages/databricks-vscode/src/test/e2e/destroy.e2e.ts
@@ -3,7 +3,6 @@ import {
     dismissNotifications,
     getUniqueResourceName,
     getViewSection,
-    selectOutputChannel,
     waitForLogin,
     waitForTreeItems,
 } from "./utils/commonUtils.ts";
@@ -72,33 +71,42 @@ describe("Deploy and destroy", async function () {
             .replaceAll(/[^a-zA-Z0-9]/g, "_")}]`;
 
         const outputView = await workbench.getBottomBar().openOutputView();
-        await selectOutputChannel(outputView, "Databricks Bundle Logs");
+        await outputView.selectChannel("Databricks Bundle Logs");
         await outputView.clearText();
 
         await browser.executeWorkbench(async (vscode) => {
             await vscode.commands.executeCommand("databricks.bundle.deploy");
         });
-
-        await browser.executeWorkbench(async (vscode) => {
-            await vscode.commands.executeCommand(
-                "workbench.panel.output.focus"
-            );
-        });
-
-        await selectOutputChannel(outputView, "Databricks Bundle Logs");
-
         console.log("Waiting for deployment to finish");
+        // Wait for the deployment to finish
         await browser.waitUntil(
             async () => {
                 try {
+                    await browser.executeWorkbench(async (vscode) => {
+                        await vscode.commands.executeCommand(
+                            "workbench.panel.output.focus"
+                        );
+                    });
+                    const outputView = await workbench
+                        .getBottomBar()
+                        .openOutputView();
+
+                    if (
+                        (await outputView.getCurrentChannel()) !==
+                        "Databricks Bundle Logs"
+                    ) {
+                        await outputView.selectChannel(
+                            "Databricks Bundle Logs"
+                        );
+                    }
+
                     const logs = (await outputView.getText()).join("");
                     console.log(logs);
                     return (
                         logs.includes("Bundle deployed successfully") &&
                         logs.includes("Bundle configuration refreshed")
                     );
                 } catch (e) {
-                    console.log("Error waiting for deployment to finish:", e);
                     return false;
                 }
             },
@@ -127,19 +135,29 @@ describe("Deploy and destroy", async function () {
             );
         });
 
-        await browser.executeWorkbench(async (vscode) => {
-            await vscode.commands.executeCommand(
-                "workbench.panel.output.focus"
-            );
-        });
-
-        await selectOutputChannel(outputView, "Databricks Bundle Logs");
-
         console.log("Waiting for bundle to destroy");
         // Wait for status to reach success
         await browser.waitUntil(
             async () => {
                 try {
+                    await browser.executeWorkbench(async (vscode) => {
+                        await vscode.commands.executeCommand(
+                            "workbench.panel.output.focus"
+                        );
+                    });
+                    const outputView = await workbench
+                        .getBottomBar()
+                        .openOutputView();
+
+                    if (
+                        (await outputView.getCurrentChannel()) !==
+                        "Databricks Bundle Logs"
+                    ) {
+                        await outputView.selectChannel(
+                            "Databricks Bundle Logs"
+                        );
+                    }
+
                     const logs = (await outputView.getText()).join("");
                     console.log(logs);
                     return (
diff --git a/packages/databricks-vscode/src/test/e2e/refresh_resource_explorer_on_yml_change.e2e.ts b/packages/databricks-vscode/src/test/e2e/refresh_resource_explorer_on_yml_change.e2e.ts
@@ -3,7 +3,6 @@ import {CustomTreeSection} from "wdio-vscode-service";
 import {
     dismissNotifications,
     getViewSection,
-    selectOutputChannel,
     waitForLogin,
 } from "./utils/commonUtils.ts";
 import {
@@ -79,8 +78,7 @@ describe("Automatically refresh resource explorer", async function () {
         const outputView = await (await browser.getWorkbench())
             .getBottomBar()
             .openOutputView();
-
-        await selectOutputChannel(outputView, "Databricks Bundle Logs");
+        await outputView.selectChannel("Databricks Bundle Logs");
 
         const jobDef = await createProjectWithJob(
             projectName,
diff --git a/packages/databricks-vscode/src/test/e2e/run_dbconnect.ucws.e2e.ts b/packages/databricks-vscode/src/test/e2e/run_dbconnect.ucws.e2e.ts
@@ -198,15 +198,9 @@ describe("Run files on serverless compute", async function () {
 
         // Install dependencies from the requirements.txt
         const dependenciesInput = await waitForInput();
-        try {
-            await dependenciesInput.toggleAllQuickPicks(true);
-        } catch (e) {
-            console.log(
-                "Failed to toggle all quick picks, moving on. Error:",
-                e
-            );
-        }
+        await dependenciesInput.toggleAllQuickPicks(true);
         await dependenciesInput.confirm();
+
         await waitForNotification("The following environment is selected");
         await waitForNotification("Databricks Connect", "Install");
 
diff --git a/packages/databricks-vscode/src/test/e2e/run_files.e2e.ts b/packages/databricks-vscode/src/test/e2e/run_files.e2e.ts
@@ -51,22 +51,10 @@ describe("Run files", async function () {
         await executeCommandWhenAvailable("Databricks: Upload and Run File");
         await browser.waitUntil(async () => {
             const notifications = await workbench.getNotifications();
-            console.log("Notifications:", notifications.length);
             for (const notification of notifications) {
                 const message = await notification.getMessage();
-                console.log("Message:", message);
                 if (message.includes("Uploading bundle assets")) {
-                    const elements = await notification.actions$.$$(
-                        notification.locators.action
-                    );
-                    console.log("Elements:", elements.length);
-                    for (const element of elements) {
-                        const text = await element.getText();
-                        if (text === "Cancel") {
-                            await element.click();
-                            break;
-                        }
-                    }
+                    await notification.takeAction("Cancel");
                     return true;
                 }
             }
diff --git a/packages/databricks-vscode/src/test/e2e/utils/commonUtils.ts b/packages/databricks-vscode/src/test/e2e/utils/commonUtils.ts
@@ -6,8 +6,6 @@ import {
     ViewControl,
     ViewSection,
     InputBox,
-    OutputView,
-    TreeItem,
 } from "wdio-vscode-service";
 
 // eslint-disable-next-line @typescript-eslint/naming-convention
@@ -21,17 +19,6 @@ const ViewSectionTypes = [
 ] as const;
 export type ViewSectionType = (typeof ViewSectionTypes)[number];
 
-export async function selectOutputChannel(
-    outputView: OutputView,
-    channelName: string
-) {
-    if ((await outputView.getCurrentChannel()) === channelName) {
-        return;
-    }
-    outputView.locatorMap.BottomBarViews.outputChannels = `ul[aria-label="Output actions"] select`;
-    await outputView.selectChannel(channelName);
-}
-
 export async function findViewSection(name: ViewSectionType) {
     const workbench = await browser.getWorkbench();
 
@@ -54,14 +41,12 @@ export async function findViewSection(name: ViewSectionType) {
     );
     const views =
         (await (await control?.openView())?.getContent()?.getSections()) ?? [];
-    console.log("Views:", views.length);
     for (const v of views) {
-        const title = await v.elem.getText();
-        console.log("View title:", title);
+        const title = await v.getTitle();
         if (title === null) {
             continue;
         }
-        if (title.toUpperCase().includes(name)) {
+        if (title.toUpperCase() === name) {
             return v;
         }
     }
@@ -350,15 +335,28 @@ export async function waitForNotification(message: string, action?: string) {
     );
 }
 
-export async function waitForDeployment(outputView: OutputView) {
+export async function waitForDeployment() {
     console.log("Waiting for deployment to finish");
-    await browser.executeWorkbench(async (vscode) => {
-        await vscode.commands.executeCommand("workbench.panel.output.focus");
-    });
-    await selectOutputChannel(outputView, "Databricks Bundle Logs");
+    const workbench = await driver.getWorkbench();
     await browser.waitUntil(
         async () => {
             try {
+                await browser.executeWorkbench(async (vscode) => {
+                    await vscode.commands.executeCommand(
+                        "workbench.panel.output.focus"
+                    );
+                });
+                const outputView = await workbench
+                    .getBottomBar()
+                    .openOutputView();
+
+                if (
+                    (await outputView.getCurrentChannel()) !==
+                    "Databricks Bundle Logs"
+                ) {
+                    await outputView.selectChannel("Databricks Bundle Logs");
+                }
+
                 const logs = (await outputView.getText()).join("");
                 console.log("------------ Bundle Output ------------");
                 console.log(logs);
@@ -378,22 +376,3 @@ export async function waitForDeployment(outputView: OutputView) {
         }
     );
 }
-
-export async function getActionButton(item: TreeItem, label: string) {
-    const actions = await item.getActionButtons();
-    if (actions.length > 0) {
-        for (const item of actions) {
-            console.log("Checking action button:", item.getLabel());
-            console.log(
-                "Action button element:",
-                await (await item.elem).getHTML()
-            );
-            const itemLabel =
-                item.getLabel() ?? (await item.elem.getAttribute("aria-label"));
-            if (itemLabel.indexOf(label) > -1) {
-                return item;
-            }
-        }
-    }
-    return undefined;
-}
diff --git a/packages/databricks-vscode/src/test/e2e/wdio.conf.ts b/packages/databricks-vscode/src/test/e2e/wdio.conf.ts
@@ -169,7 +169,7 @@ export const config: Options.Testrunner = {
         return [
             {
                 "browserName": "vscode",
-                "browserVersion": engines.vscode.replace(/\^/, ""),
+                "browserVersion": engines.vscode.replace("^", ""),
                 "wdio:vscodeOptions": {
                     extensionPath: path.resolve(
                         __dirname,

Original file line number	Diff line number	Diff line change
`@@ -169,7 +169,7 @@ export const config: Options.Testrunner = {`
`169`	`169`	`return [`
`170`	`170`	`{`
`171`	`171`	`"browserName": "vscode",`
`172`		`- "browserVersion": engines.vscode.replace(/\^/, ""),`
	`172`	`+ "browserVersion": engines.vscode.replace("^", ""),`
`173`	`173`	`"wdio:vscodeOptions": {`
`174`	`174`	`extensionPath: path.resolve(`
`175`	`175`	`__dirname,`