Fix tests.

Author: christogav

.vscode-test.mjs

@@ -0,0 +1,9 @@
+import { defineConfig } from "@vscode/test-cli";
+
+export default defineConfig([
+  {
+    label: "unitTests",
+    files: "out/test/**/*.test.js",
+    workspaceFolder: "./test-workspaces/npm-buf-workspace",
+  },
+]);

.vscode/launch.json

@@ -14,7 +14,7 @@
         "--extensionDevelopmentPath=${workspaceFolder}"
       ],
       "outFiles": ["${workspaceFolder}/out/**/*.js"],
-      "preLaunchTask": "${defaultBuildTask}"
+      "preLaunchTask": "npm: watch"
     },
     {
       "name": "Extension Tests",

.vscode/tasks.json

@@ -4,6 +4,7 @@
   "version": "2.0.0",
   "tasks": [
     {
+      "label": "npm: watch",
       "type": "npm",
       "script": "watch",
       "problemMatcher": "$tsc-watch",

package-lock.json

@@ -216,13 +216,12 @@
     "pretest": "npm run compile && npm run prepworkspaces",
     "prepworkspaces": "(cd test-workspaces/npm-buf-workspace && npm install)",
     "lint": "eslint --max-warnings 0 .",
-    "test": "npm run test-compile && node ./out/test/run-test.js",
+    "test": "vscode-test",
     "package": "vsce package",
     "format": "prettier --write '**/*.{json,js,jsx,ts,tsx,css,yaml,yml,mjs,mts,md}' --log-level error"
   },
   "devDependencies": {
     "@eslint/js": "^9.23.0",
-    "@types/glob": "^8.1.0",
     "@types/mocha": "^10.0.6",
     "@types/node": "^20.x",
     "@types/proxyquire": "^1.3.31",
@@ -237,7 +236,6 @@
     "@vscode/vsce": "^2.15.0",
     "eslint": "^9.23.0",
     "eslint-plugin-unicorn": "^58.0.0",
-    "glob": "^11.0.1",
     "globals": "^16.0.0",
     "mocha": "^10.2.0",
     "prettier": "^3.5.3",
@@ -252,4 +250,4 @@
     "vscode-languageclient": "^9.0.1",
     "which": "^5.0.0"
   }
-}
+}

package.json

@@ -1,3 +1,5 @@
+import * as vscode from "vscode";
+
 import { Disposable, ExtensionContext } from "vscode";
 
 export type ExtensionContextPlus = ExtensionContext &
@@ -6,6 +8,8 @@ export type ExtensionContextPlus = ExtensionContext &
 export class MockExtensionContext implements Partial<ExtensionContext> {
   subscriptions: Disposable[] = [];
 
+  globalStorageUri?: vscode.Uri | undefined = vscode.Uri.file("/path/to/buf");
+
   static new(): ExtensionContextPlus {
     return new this() as unknown as ExtensionContextPlus;
   }

test/mocks/mock-context.ts

@@ -62,7 +62,7 @@ suite("commands.findBuf", () => {
 
     whichStub = sandbox.stub();
 
-    findBufMod = proxyquire("../../../src/commands/findBuf", {
+    findBufMod = proxyquire("../../../src/commands/find-buf", {
       which: whichStub,
     });
 
@@ -112,7 +112,7 @@ suite("commands.findBuf", () => {
     const storagePath = "/path/to/storage";
     const bufPath = path.join(storagePath, "v1", bufFilename);
 
-    sandbox.spy(ctx, "globalStorageUri", ["get"]).get().returns({
+    sandbox.stub(ctx, "globalStorageUri").value({
       fsPath: storagePath,
     });
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -132,7 +132,7 @@ suite("commands.findBuf", () => {
     whichStub.returns(bufPath);
 
     const storagePath = "/path/to/storage";
-    sandbox.spy(ctx, "globalStorageUri", ["get"]).get().returns({
+    sandbox.stub(ctx, "globalStorageUri").value({
       fsPath: storagePath,
     });
 

test/run-test.ts

@@ -134,7 +134,7 @@ suite("commands.installBuf", () => {
     sandbox.stub(github, "findAsset").resolves(dummyAsset);
 
     const storagePath = "/path/to/storage";
-    sandbox.spy(ctx, "globalStorageUri", ["get"]).get().returns({
+    sandbox.stub(ctx, "globalStorageUri").value({
       fsPath: storagePath,
     });
 

test/unit/commands/find-buf.test.ts

@@ -9,7 +9,7 @@ import {
 } from "../mocks/mock-context";
 import { BufContext } from "../../src/context";
 
-describe("status", function () {
+suite("status", function () {
   vscode.window.showInformationMessage("Start all status tests.");
 
   let sandbox: sinon.SinonSandbox;
@@ -64,11 +64,11 @@ describe("status", function () {
     status.disposeStatusBar();
   });
 
-  it("activate creates an output channel", function () {
+  test("activate creates an output channel", function () {
     assert.strictEqual(createOutputChannelStub.callCount, 1);
   });
 
-  it("activate sets up subscriptions", function () {
+  test("activate sets up subscriptions", function () {
     assert.strictEqual(ctx.subscriptions.length, 2);
     assert.strictEqual(bufCtxonDidChangeContextSpy.get.calledOnce, true);
   });