Add a git branch detection test

Author: walles

src/extension.ts

@@ -85,6 +85,17 @@ export async function activate(context: vscode.ExtensionContext) {
     null,
     context.subscriptions,
   );
+
+  const api = {
+    /**
+     * Exposed for testing purposes.
+     */
+    get gitBranch() {
+      return gitBranch;
+    },
+  };
+
+  return api;
 }
 
 // This method is called when your extension is deactivated

src/getgitbranch.ts

@@ -68,13 +68,9 @@ async function getCurrentGitBranchFromGit(
   const docDirectory = utils.dirname(docWithAbsolutePath);
 
   try {
-    const { stdout } = await execFile(
-      "git",
-      ["rev-parse", "--abbrev-ref", "HEAD"],
-      {
-        cwd: docDirectory,
-      },
-    );
+    const { stdout } = await execFile("git", ["branch", "--show-current"], {
+      cwd: docDirectory,
+    });
 
     const branchName = stdout.trim();
     if (!branchName) {

src/test/suite/extensionIntegration.test.ts

@@ -0,0 +1,44 @@
+import * as assert from "assert";
+import * as vscode from "vscode";
+import * as path from "path";
+import * as fs from "fs";
+import * as os from "os";
+
+import { execSync } from "child_process";
+
+suite("Extension Integration", () => {
+  test("Git branch detected in not-in-workspace file", async () => {
+    const tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), "git-commit-test-"));
+    const commitMessage = path.join(tmpDir, "COMMIT_EDITMSG");
+    fs.writeFileSync(commitMessage, "Initial commit\n\nDetails here.\n");
+
+    // Create a repo and a branch that we can detect
+    execSync("git init", { cwd: tmpDir });
+    execSync("git checkout -b test-branch", { cwd: tmpDir });
+
+    // Open the file in an editor
+    const doc = await vscode.workspace.openTextDocument(
+      vscode.Uri.file(commitMessage),
+    );
+    await vscode.window.showTextDocument(doc);
+
+    // Wait for extension activation to complete
+    const ext = vscode.extensions.getExtension(
+      "walles.git-commit-message-plus",
+    )!;
+    await ext.activate();
+
+    // Wait (up to ~2s) for async branch detection to populate gitBranch
+    const deadline = Date.now() + 2000;
+    let actualBranch: string | undefined = ext.exports.gitBranch;
+    while (!actualBranch && Date.now() < deadline) {
+      await new Promise((r) => globalThis.setTimeout(r, 50));
+      actualBranch = ext.exports.gitBranch;
+    }
+
+    assert.strictEqual(actualBranch, "test-branch");
+
+    // Clean up
+    fs.rmSync(tmpDir, { recursive: true, force: true });
+  });
+});