Merge branch 'master' of https://github.com/zowe/vscode-extension-for…

…-zowe into v1.0.x Luckily master did not have any enhancements yet. Signed-off-by: zFernand0 <fernando.rijocedeno@broadcom.com>
zowe · Dec 11, 2019 · 30f8d85 · 30f8d85
2 parents 8160760 + ea6c44a
commit 30f8d85
Show file tree

Hide file tree

Showing 29 changed files with 355 additions and 395 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -13,5 +13,6 @@
     // Turn off tsc task auto detection since we have the necessary tasks as npm scripts
    "typescript.tsc.autoDetect": "off",
    // Make sure people do not accidentally forget to sign
-   "git.alwaysSignOff": true
+   "git.alwaysSignOff": true,
+   "typescript.tsdk": "node_modules/typescript/lib"
 }
diff --git a/__tests__/__integration__/extension.integration.test.ts b/__tests__/__integration__/extension.integration.test.ts
@@ -96,7 +96,7 @@ describe("Extension Integration Tests", () => {
             const stubresolve = sandbox.stub(utils, "resolveQuickPickHelper");
             stubresolve.returns(new utils.FilterItem(profileNamesList[0]));
 
-            await extension.addSession(testTree);
+            await extension.addZoweSession(testTree);
             expect(testTree.mSessionNodes[testTree.mSessionNodes.length - 1].label).to.equal(profileNamesList[0]);
         }).timeout(TIMEOUT);
     });
@@ -944,7 +944,7 @@ describe("Extension Integration Tests - USS", () => {
             const stubresolve = sandbox.stub(utils, "resolveQuickPickHelper");
             stubresolve.returns(new utils.FilterItem(profileNamesList[0]));
 
-            await extension.addUSSSession(ussTestTree);
+            await extension.addZoweSession(ussTestTree);
             expect(ussTestTree.mSessionNodes[ussTestTree.mSessionNodes.length - 1].label).to.equal(profileNamesList[0]);
         }).timeout(TIMEOUT);
     });

diff --git a/__tests__/__unit__/__snapshots__/extension.unit.test.ts.snap b/__tests__/__unit__/__snapshots__/extension.unit.test.ts.snap
@@ -152,11 +152,6 @@ Array [
     "group": "inline",
     "when": "view == zowe.explorer && viewItem == member_fav",
   },
-  Object {
-    "command": "zowe.refreshNode",
-    "group": "inline",
-    "when": "view == zowe.explorer && viewItem == member_fav",
-  },
   Object {
     "command": "zowe.refreshNode",
     "group": "0_mainframeInteraction",
@@ -187,16 +182,6 @@ Array [
     "group": "inline",
     "when": "view == zowe.explorer && viewItem == ds",
   },
-  Object {
-    "command": "zowe.renameDataSetMember",
-    "group": "6_modification@2",
-    "when": "view == zowe.explorer && viewItem == member_fav",
-  },
-  Object {
-    "command": "zowe.refreshNode",
-    "group": "inline",
-    "when": "view == zowe.explorer && viewItem == ds",
-  },
   Object {
     "command": "zowe.refreshNode",
     "group": "0_mainframeInteraction",
@@ -242,21 +227,6 @@ Array [
     "group": "inline",
     "when": "view == zowe.explorer && viewItem == ds_fav",
   },
-  Object {
-    "command": "zowe.copyDataSet",
-    "group": "9_cutcopypaste",
-    "when": "view == zowe.explorer && viewItem == ds",
-  },
-  Object {
-    "command": "zowe.pasteDataSet",
-    "group": "9_cutcopypaste",
-    "when": "view == zowe.explorer && viewItem == ds",
-  },
-  Object {
-    "command": "zowe.refreshNode",
-    "group": "inline",
-    "when": "view == zowe.explorer && viewItem == ds_fav",
-  },
   Object {
     "command": "zowe.refreshNode",
     "group": "0_mainframeInteraction",