WIP debug state

Author: anderson4j

packages/vscode-extension/package.json

@@ -337,7 +337,7 @@
     "clean": "rm -rf dist",
     "test:e2e": "npm run build:dev && npm run test:apiAndUnit && npm run test:webviews",
     "test:apiAndUnit": "npm run build:dev && rm -rf .vscode-test/user-data && node ./dist/tests/runApiAndUnitTests.js",
-    "test:webviews": "wdio run ./dist/tests/runWebviewTests.js"
+    "test:webviews": "npm run build:dev && wdio run ./dist/tests/runWebviewTests.js"
   },
   "dependencies": {
     "@neo4j-cypher/language-server": "2.0.0-next.17",

packages/vscode-extension/tests/specs/api/syntaxValidation.spec.ts

@@ -69,7 +69,7 @@ export async function testSyntaxValidation({
   );
 }
 
-suite.only('Syntax validation spec', () => {
+suite('Syntax validation spec', () => {
   afterEach(async () => {
     await toggleLinting(true);
   });

packages/vscode-extension/tests/specs/webviews/connection.spec.ts

@@ -4,11 +4,10 @@ import * as os from 'os';
 import { ViewSection, Workbench } from 'wdio-vscode-service';
 import { CONSTANTS } from '../../../src/constants';
 import {
-  clickOnConnectionItem,
+  clickOnContextMenuItem,
   closeActiveTab,
   getConnectionSection,
   openFixtureFile,
-  selectConnectionItem,
   setText,
   waitUntilNotification,
 } from '../../webviewUtils';
@@ -26,40 +25,40 @@ suite('Connection testing', () => {
     if (os.platform() === 'darwin') {
       this.skip();
     }
-    await clickOnConnectionItem(connectionSection, 'Disconnect', 1);
+    await clickOnContextMenuItem(connectionSection, 'Disconnect', 1);
     await waitUntilNotification(browser, 'Disconnected from Neo4j.');
   });
 
   test('should connect to neo4j gracefully', async function () {
     if (os.platform() === 'darwin') {
       this.skip();
     }
-    await clickOnConnectionItem(connectionSection, 'Connect', 1);
+    await clickOnContextMenuItem(connectionSection, 'Connect', 1);
     await waitUntilNotification(browser, 'Connected to Neo4j.');
   });
 
-  test('should connect when selecting new connection', async function () {
-    await selectConnectionItem(connectionSection, 1);
-    await waitUntilNotification(browser, 'Connected to Neo4j.');
-  });
+  // test('should connect when selecting new connection', async function () {
+  //   await selectConnectionItem(connectionSection, 1);
+  //   await waitUntilNotification(browser, 'Connected to Neo4j.');
+  // });
 
-  test('should expand connectionItems when selecting connected connection', async function () {
-    await selectConnectionItem(connectionSection, 1);
-    await waitUntilNotification(browser, 'Connected to Neo4j.');
-    await expect((await connectionSection.getVisibleItems()).length).toBe(2);
-    await selectConnectionItem(connectionSection, 1);
-    await expect((await connectionSection.getVisibleItems()).length).toBe(4);
-  });
+  // test('should expand connectionItems when selecting connected connection', async function () {
+  //   await selectConnectionItem(connectionSection, 1);
+  //   await waitUntilNotification(browser, 'Connected to Neo4j.');
+  //   await expect((await connectionSection.getVisibleItems()).length).toBe(2);
+  //   await selectConnectionItem(connectionSection, 1);
+  //   await expect((await connectionSection.getVisibleItems()).length).toBe(4);
+  // });
 
   test('should be able to connect to another instance', async function () {
     if (os.platform() === 'darwin') {
       this.skip();
     }
-    await clickOnConnectionItem(connectionSection, 'Connect', 0);
+    await clickOnContextMenuItem(connectionSection, 'Connect', 0);
     await waitUntilNotification(browser, 'Connected to Neo4j.');
 
     // Reconnect to the original instance
-    await clickOnConnectionItem(connectionSection, 'Connect', 1);
+    await clickOnContextMenuItem(connectionSection, 'Connect', 1);
     await waitUntilNotification(browser, 'Connected to Neo4j.');
   });
 

packages/vscode-extension/tests/specs/webviews/queryExecution.spec.ts

@@ -4,7 +4,7 @@ import * as os from 'os';
 import { ViewSection, Workbench } from 'wdio-vscode-service';
 import { CONSTANTS } from '../../../src/constants';
 import {
-  clickOnConnectionItem,
+  clickOnContextMenuItem,
   getConnectionSection,
   openFixtureFile,
   waitUntilNotification,
@@ -95,7 +95,7 @@ suite('Query results testing', () => {
 
     // Disconnect from the current instance
     // Connect to an empty one, the results should be empty
-    await clickOnConnectionItem(connectionSection, 'Connect', 0);
+    await clickOnContextMenuItem(connectionSection, 'Connect', 0);
     await waitUntilNotification(browser, 'Connected to Neo4j.');
 
     await executeFile('match-for-create.cypher');
@@ -105,7 +105,7 @@ suite('Query results testing', () => {
     });
 
     // Reconnect to the original instance
-    await clickOnConnectionItem(connectionSection, 'Connect', 1);
+    await clickOnContextMenuItem(connectionSection, 'Connect', 1);
     await waitUntilNotification(browser, 'Connected to Neo4j.');
   });
 });

packages/vscode-extension/tests/webviewUtils.ts

@@ -127,23 +127,58 @@ export async function selectConnectionItem(
   connectionSection: ViewSection,
   connectionIndex: integer,
 ): Promise<void> {
-  const items = (await connectionSection.getVisibleItems()).filter(
-    async (i) => !(await i.parent),
-  );
+  const items = await connectionSection.getVisibleItems();
+  const filteredItems = (
+    await Promise.all(
+      items.map(async (i) => ({ item: i, hasParent: await i.parent })),
+    )
+  )
+    .filter(({ hasParent }) => !hasParent)
+    .map(({ item }) => item);
+
+  await expect(filteredItems.length).toBeGreaterThan(connectionIndex);
+  const connectionItem = filteredItems.at(connectionIndex) as TreeItem;
+  await connectionItem.select();
+}
+
+export async function clickOnContextMenuItem(
+  connectionSection: ViewSection,
+  item: string,
+  connectionIndex: number,
+): Promise<void> {
+  const items = await connectionSection.getVisibleItems();
 
   await expect(items.length).toBeGreaterThan(connectionIndex);
   const connectionItem = items.at(connectionIndex) as TreeItem;
-  await connectionItem.select();
+
+  // This context menu does not work in OSX because it's a native element rather
+  // than a browser, so we get errors of the sort of
+  //    element (".monaco-menu-container") still not displayed after 5000ms
+  //
+  // https://github.com/webdriverio-community/wdio-vscode-service/issues/57
+  const contextMenu = await connectionItem.openContextMenu();
+  const menuItems = await contextMenu.getItems();
+  const connect = menuItems.find(async (menuItem) => {
+    const menuText = await menuItem.elem.getText();
+    return menuText === item;
+  });
+
+  if (connect) {
+    const connectOption = await connect.elem;
+    await connectOption.click();
+  }
 }
 
 export async function clickOnConnectionItem(
   connectionSection: ViewSection,
   item: string,
   connectionIndex: number,
 ): Promise<void> {
-  const items = (await connectionSection.getVisibleItems()).filter(
-    async (i) => !(await i.parent),
-  );
+  // const items = await connectionSection.getVisibleItems();
+  // const filteredItems = (await Promise.all(
+  //   items.map(async (i) => ({ item: i, hasParent: await i.parent }))
+  // )).filter(({ hasParent }) => !hasParent).map(({ item }) => item);
+  const items = await connectionSection.getVisibleItems();
 
   await expect(items.length).toBeGreaterThan(connectionIndex);
   const connectionItem = items.at(connectionIndex) as TreeItem;