🧪 Fix tests for git utilities

Co-authored-by: sunnylqm <615282+sunnylqm@users.noreply.github.com>

Author: google-labs-jules[bot]

src/utils/git.ts

@@ -11,6 +11,14 @@ export interface CommitInfo {
   origin: string;
 }
 
+export function getCurrentCommit() {
+  const result = spawnSync('git', ['rev-parse', 'HEAD']);
+  if (result.status !== 0) {
+    throw new Error('Not a git repository');
+  }
+  return result.stdout.toString().trim();
+}
+
 function findGitRoot(dir = process.cwd()) {
   const gitRoot = fs.readdirSync(dir).find((dir) => dir === '.git');
   if (gitRoot) {
@@ -49,11 +57,3 @@ export async function getCommitInfo(): Promise<CommitInfo | undefined> {
     return;
   }
 }
-
-export function getCurrentCommit() {
-  const result = spawnSync('git', ['rev-parse', 'HEAD']);
-  if (result.status !== 0) {
-    throw new Error('Not a git repository');
-  }
-  return result.stdout.toString().trim();
-}

tests/git.test.ts

@@ -1,46 +1,44 @@
-import { describe, it, expect, mock, afterEach, beforeEach, spyOn } from 'bun:test';
+import { describe, expect, it, mock } from 'bun:test';
 
 // Define the mock functions so we can manipulate them in tests
 const spawnSyncMock = mock(() => ({
   status: 0,
-  stdout: Buffer.from('mock-hash-123\n')
+  stdout: Buffer.from('mock-hash-123\n'),
 }));
 
 mock.module('child_process', () => ({
-  spawnSync: spawnSyncMock
+  spawnSync: spawnSyncMock,
 }));
 
-const listRemotesMock = mock(async () => [{ remote: 'origin', url: 'https://github.com/test/repo.git' }]);
-const logMock = mock(async () => [{
-  oid: 'mock-commit-hash',
-  commit: {
-    message: 'mock commit message',
-    author: { name: 'Test Author' },
-    committer: { name: 'Test Committer', timestamp: 1625097600 }
-  }
-}]);
+const listRemotesMock = mock(async () => [
+  { remote: 'origin', url: 'https://github.com/test/repo.git' },
+]);
+const logMock = mock(async () => [
+  {
+    oid: 'mock-commit-hash',
+    commit: {
+      message: 'mock commit message',
+      author: { name: 'Test Author' },
+      committer: { name: 'Test Committer', timestamp: 1625097600 },
+    },
+  },
+]);
 
 mock.module('isomorphic-git', () => ({
   default: {
     listRemotes: listRemotesMock,
-    log: logMock
-  }
+    log: logMock,
+  },
 }));
 
-import { getCurrentCommit, getCommitInfo } from '../src/utils/git';
-
-describe('git utils', () => {
-  afterEach(() => {
-    spawnSyncMock.mockClear();
-    listRemotesMock.mockClear();
-    logMock.mockClear();
-  });
+describe('git utils', async () => {
+  const { getCommitInfo, getCurrentCommit } = await import('../src/utils/git');
 
   describe('getCurrentCommit', () => {
     it('should return the commit hash when git command succeeds', () => {
       spawnSyncMock.mockImplementationOnce(() => ({
         status: 0,
-        stdout: Buffer.from('abcdef1234567890\n')
+        stdout: Buffer.from('abcdef1234567890\n'),
       }));
 
       const commit = getCurrentCommit();
@@ -52,7 +50,9 @@ describe('git utils', () => {
       spawnSyncMock.mockImplementationOnce(() => ({
         status: 128,
         stdout: Buffer.from(''),
-        stderr: Buffer.from('fatal: not a git repository (or any of the parent directories): .git\n')
+        stderr: Buffer.from(
+          'fatal: not a git repository (or any of the parent directories): .git\n',
+        ),
       }));
 
       expect(() => getCurrentCommit()).toThrow('Not a git repository');
@@ -76,14 +76,16 @@ describe('git utils', () => {
     });
 
     it('should handle missing author name by falling back to committer name', async () => {
-      logMock.mockImplementationOnce(async () => [{
-        oid: 'mock-commit-hash-2',
-        commit: {
-          message: 'another message',
-          author: { name: '' },
-          committer: { name: 'Fallback Committer', timestamp: 1625098000 }
-        }
-      }]);
+      logMock.mockImplementationOnce(async () => [
+        {
+          oid: 'mock-commit-hash-2',
+          commit: {
+            message: 'another message',
+            author: { name: '' },
+            committer: { name: 'Fallback Committer', timestamp: 1625098000 },
+          },
+        },
+      ]);
 
       const info = await getCommitInfo();
       expect(info?.author).toBe('Fallback Committer');