fix: cannot getActions for a view section when some button is disabled (

#1420)
redhat-developer · Jul 18, 2024 · 64a93e4 · 64a93e4
1 parent 4213331
commit 64a93e4
Show file tree

Hide file tree

Showing 7 changed files with 64 additions and 6 deletions.
diff --git a/packages/page-objects/src/components/sidebar/ViewSection.ts b/packages/page-objects/src/components/sidebar/ViewSection.ts
@@ -221,7 +221,7 @@ export class ViewPanelAction extends AbstractElement {
 	}
 
 	async wait(timeout: number = 1000): Promise<this> {
-		await this.getDriver().wait(until.elementIsEnabled(this), timeout);
+		await this.getDriver().wait(until.elementLocated(ViewSection.locators.ViewSection.actions), timeout);
 		return this;
 	}
 }
diff --git a/tests/test-project/package.json b/tests/test-project/package.json
@@ -99,6 +99,14 @@
       {
         "command": "extension.treeItemAction",
         "title": "Tree Item Action"
+      },
+      {
+        "command": "testView.refresh",
+        "title": "Refresh",
+        "icon": {
+          "light": "resources/icons/light/refresh.svg",
+          "dark": "resources/icons/dark/refresh.svg"
+        }
       }
     ],
     "viewsContainers": {
@@ -116,6 +124,10 @@
           "id": "testView",
           "name": "Test View"
         },
+        {
+          "id": "testView2",
+          "name": "Test View 2"
+        },
         {
           "id": "emptyView",
           "name": "Empty View"
@@ -186,6 +198,12 @@
           "when": "viewItem =~ /ExtensionTreeItem/",
           "group": "inline"
         }
+      ],
+      "view/title": [
+        {
+          "command": "testView.refresh",
+          "group": "navigation"
+        }
       ]
     }
   },

diff --git a/tests/test-project/resources/icons/dark/refresh.svg b/tests/test-project/resources/icons/dark/refresh.svg
diff --git a/tests/test-project/resources/icons/light/refresh.svg b/tests/test-project/resources/icons/light/refresh.svg
diff --git a/tests/test-project/src/extension.ts b/tests/test-project/src/extension.ts
@@ -2,7 +2,7 @@ import * as path from 'path';
 import * as vscode from 'vscode';
 import { CatScratchEditorProvider } from './catScratchEditor';
 import { CodelensProvider } from './codelensProvider';
-import { TreeView } from './treeView';
+import { TreeView, TreeView2 } from './treeView';
 
 export const ERROR_MESSAGE_COMMAND = 'extension.errorMsg';
 
@@ -57,7 +57,14 @@ export function activate(context: vscode.ExtensionContext) {
 	context.subscriptions.push(vscode.commands.registerCommand(ERROR_MESSAGE_COMMAND, () => vscode.window.showErrorMessage('This is an error!')));
 	context.subscriptions.push(CatScratchEditorProvider.register(context));
 
-	new TreeView(context);
+	new TreeView(context, 'testView');
+	new TreeView2(context, 'testView2');
+
+	context.subscriptions.push(
+		vscode.commands.registerCommand('testView.refresh', async () => {
+			await vscode.window.showInformationMessage('Refresh View button clicked!');
+		}),
+	);
 
 	context.subscriptions.push(
 		vscode.window.createTreeView('emptyView', {

diff --git a/tests/test-project/src/test/xsideBar/customView.test.ts b/tests/test-project/src/test/xsideBar/customView.test.ts
@@ -33,6 +33,7 @@ import {
 
 describe('CustomTreeSection', () => {
 	let section: CustomTreeSection;
+	let emptySection: CustomTreeSection;
 	let emptyViewSection: CustomTreeSection;
 	let content: ViewContent;
 
@@ -44,6 +45,8 @@ describe('CustomTreeSection', () => {
 		});
 		content = view.getContent();
 		section = await content.getSection('Test View');
+		emptySection = await content.getSection('Test View 2');
+		await emptySection.expand();
 		emptyViewSection = await content.getSection('Empty View');
 		await emptyViewSection.expand();
 	});
@@ -104,11 +107,22 @@ describe('CustomTreeSection', () => {
 		expect(actions).not.empty;
 	});
 
+	it('getActions of EMPTY works', async () => {
+		const actions = await emptySection.getActions();
+		expect(actions).not.empty;
+	});
+
 	it('getAction works', async () => {
 		const action = await section.getAction('Collapse All');
 		expect(await action?.getLabel()).equals('Collapse All');
 	});
 
+	it('getAction of EMPTY works', async () => {
+		const action = await emptySection.getAction('Refresh');
+		expect(await action?.getLabel()).equals('Refresh');
+		await emptySection.collapse();
+	});
+
 	it('findWelcomeContent returns undefined if no WelcomeContent is present', async () => {
 		expect(await section.findWelcomeContent()).to.equal(undefined);
 		expect(await emptyViewSection.findWelcomeContent()).to.not.equal(undefined);

diff --git a/tests/test-project/src/treeView.ts b/tests/test-project/src/treeView.ts
@@ -2,19 +2,36 @@ import * as vscode from 'vscode';
 import { ERROR_MESSAGE_COMMAND } from './extension';
 
 /**
- * Test tree view as shown in treeview sample extension available at
+ * Test tree view as shown in TreeView sample extension available at
  * https://github.com/microsoft/vscode-extension-samples/tree/master/tree-view-sample
  */
 export class TreeView {
-	constructor(context: vscode.ExtensionContext) {
-		const view = vscode.window.createTreeView('testView', {
+	constructor(context: vscode.ExtensionContext, viewID: string) {
+		const view = vscode.window.createTreeView(viewID, {
 			treeDataProvider: dataProvider(),
 			showCollapseAll: true,
 		});
 		context.subscriptions.push(view);
 	}
 }
 
+export class TreeView2 {
+	constructor(context: vscode.ExtensionContext, viewID: string) {
+		const view = vscode.window.createTreeView(viewID, {
+			treeDataProvider: {
+				getTreeItem: function (): vscode.TreeItem | Thenable<vscode.TreeItem> {
+					return {};
+				},
+				getChildren: function (): vscode.ProviderResult<unknown[]> {
+					return [];
+				},
+			},
+			showCollapseAll: true,
+		});
+		context.subscriptions.push(view);
+	}
+}
+
 type Tree = { [key: string]: Tree | undefined | null };
 
 // structure of the test tree: