Fix openItemFromPath test and remove extra mock

Signed-off-by: Timothy Johnson <[email protected]>
zowe · Dec 19, 2023 · f859b5a · f859b5a
1 parent 9b344aa
commit f859b5a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/packages/zowe-explorer/__tests__/__unit__/uss/USSTree.unit.test.ts b/packages/zowe-explorer/__tests__/__unit__/uss/USSTree.unit.test.ts
@@ -1158,19 +1158,21 @@ describe("USSTree Unit Tests - Function openItemFromPath", () => {
         const file = new ZoweUSSNode({
             label: "c.txt",
             collapsibleState: vscode.TreeItemCollapsibleState.Collapsed,
-            parentNode: globalMocks.testTree.mSessionNodes[0],
+            parentNode: globalMocks.testTree.mSessionNodes[1],
             parentPath: "/a/b",
         });
-        jest.spyOn(globalMocks.testTree, "getChildren").mockReturnValue(Promise.resolve([file]));
+        jest.spyOn(globalMocks.testTree.mSessionNodes[1], "getChildren").mockResolvedValue([file]);
+        const openNodeSpy = jest.spyOn(file, "openUSS").mockImplementation();
 
         await globalMocks.testTree.openItemFromPath("/a/b/c.txt", globalMocks.testTree.mSessionNodes[1]);
+        expect(openNodeSpy).toHaveBeenCalledWith(false, true, globalMocks.testTree);
         expect(globalMocks.testTree.getSearchHistory().includes("[sestest]: /a/b/c.txt")).toBe(true);
     });
 
     it("Tests that openItemFromPath fails when the node no longer exists", async () => {
         const globalMocks = await createGlobalMocks();
 
-        jest.spyOn(globalMocks.testTree, "getChildren").mockReturnValue(Promise.resolve([]));
+        jest.spyOn(globalMocks.testTree.mSessionNodes[1], "getChildren").mockResolvedValue([]);
         const fileHistorySpy = jest.spyOn(globalMocks.testTree, "removeFileHistory");
 
         await globalMocks.testTree.openItemFromPath("/d.txt", globalMocks.testTree.mSessionNodes[1]);

diff --git a/packages/zowe-explorer/__tests__/__unit__/uss/actions.unit.test.ts b/packages/zowe-explorer/__tests__/__unit__/uss/actions.unit.test.ts
@@ -24,7 +24,6 @@ import {
     createFileResponse,
     createValidIProfile,
     createInstanceOfProfile,
-    createTreeProviders,
 } from "../../../__mocks__/mockCreators/shared";
 import { ZoweExplorerApiRegister } from "../../../src/ZoweExplorerApiRegister";
 import { Profiles } from "../../../src/Profiles";
@@ -40,7 +39,6 @@ import { createUssApi, bindUssApi } from "../../../__mocks__/mockCreators/api";
 import * as refreshActions from "../../../src/shared/refresh";
 import { ZoweLogger } from "../../../src/utils/LoggerUtils";
 import { AttributeView } from "../../../src/uss/AttributeView";
-import { TreeProviders } from "../../../src/shared/TreeProviders";
 
 function createGlobalMocks() {
     const globalMocks = {
@@ -122,7 +120,6 @@ function createGlobalMocks() {
         value: globalMocks.isFileTagBinOrAscii,
         configurable: true,
     });
-    Object.defineProperty(TreeProviders, "uss", { value: createTreeProviders().uss, configurable: true });
     Object.defineProperty(vscode.window, "showErrorMessage", {
         value: globalMocks.showErrorMessage,
         configurable: true,

diff --git a/packages/zowe-explorer/src/uss/USSTree.ts b/packages/zowe-explorer/src/uss/USSTree.ts
@@ -908,10 +908,10 @@ export class USSTree extends ZoweTreeProvider implements IZoweTree<IZoweUSSTreeN
         sessionNode.label = `${sessionNode.getProfileName()} [/${nodePath.join("/")}]`;
         sessionNode.dirty = true;
         this.addSearchHistory(`[${sessionNode.getProfileName()}]: /${nodePath.join("/")}`);
-        await sessionNode.getChildren();
+        const children = await sessionNode.getChildren();
 
         // Reveal the searched item in the tree
-        const selectedNode: IZoweUSSTreeNode = sessionNode.children.find((elt) => elt.label === selectedNodeName);
+        const selectedNode: IZoweUSSTreeNode = children.find((elt) => elt.label === selectedNodeName);
         if (selectedNode) {
             await selectedNode.openUSS(false, true, this);
         } else {