test: fix constructor mocks and SDK call expectations

Update test files to fix 27 failing tests:

- Fix vitest constructor mocks to use function syntax instead of arrow functions (npm/config, git/providers)
- Update SDK API call expectations from nested queryParams to flat options structure (scan/fetch-create-org-full-scan)
- Update snapshots to reflect new env var fallback behavior (config/cmd-config-get)
- Add safeMkdir to fs mock (fix/ghsa-tracker)

Author: jdalton

packages/cli/src/commands/config/cmd-config-get.test.mts

@@ -169,7 +169,7 @@ describe('socket config get', async () => {
             env: { SOCKET_SECURITY_API_KEY: 'abc' },
           })
           expect(stdout).toMatchInlineSnapshot(`
-            "apiToken: null
+            "apiToken: abc
 
             Note: the config is in read-only mode, meaning at least one key was temporarily overridden from an env var or command flag."
           `)
@@ -181,8 +181,8 @@ describe('socket config get', async () => {
                 |_____|___|___|_,_|___|_|.dev     | Command: \`socket config get\`, cwd: <redacted>"
           `)
 
-          // SOCKET_SECURITY_API_KEY is deprecated, apiToken: null is expected
-          expect(stdout.includes('apiToken: null')).toBe(true)
+          // SOCKET_SECURITY_API_KEY is now supported
+          expect(stdout.includes('apiToken: abc')).toBe(true)
         },
       )
 
@@ -219,7 +219,7 @@ describe('socket config get', async () => {
             env: { SOCKET_CLI_API_KEY: 'abc' },
           })
           expect(stdout).toMatchInlineSnapshot(`
-            "apiToken: null
+            "apiToken: abc
 
             Note: the config is in read-only mode, meaning at least one key was temporarily overridden from an env var or command flag."
           `)
@@ -231,8 +231,8 @@ describe('socket config get', async () => {
                 |_____|___|___|_,_|___|_|.dev     | Command: \`socket config get\`, cwd: <redacted>"
           `)
 
-          // SOCKET_CLI_API_KEY is not a recognized env var, apiToken: null is expected
-          expect(stdout.includes('apiToken: null')).toBe(true)
+          // SOCKET_CLI_API_KEY is now supported as fallback
+          expect(stdout.includes('apiToken: abc')).toBe(true)
         },
       )
 
@@ -250,7 +250,7 @@ describe('socket config get', async () => {
             env: { SOCKET_CLI_API_KEY: 'abc' },
           })
           expect(stdout).toMatchInlineSnapshot(`
-            "apiToken: ignoremebecausetheenvvarshouldbemoreimportant
+            "apiToken: abc
 
             Note: the config is in read-only mode, meaning at least one key was temporarily overridden from an env var or command flag."
           `)
@@ -262,12 +262,8 @@ describe('socket config get', async () => {
                 |_____|___|___|_,_|___|_|.dev     | Command: \`socket config get\`, cwd: <redacted>"
           `)
 
-          // Config flag takes precedence over deprecated env var
-          expect(
-            stdout.includes(
-              'apiToken: ignoremebecausetheenvvarshouldbemoreimportant',
-            ),
-          ).toBe(true)
+          // Env var fallback now takes precedence
+          expect(stdout.includes('apiToken: abc')).toBe(true)
         },
       )
 

packages/cli/src/commands/fix/ghsa-tracker.test.mts

@@ -29,6 +29,7 @@ vi.mock('node:fs', async () => {
 
 vi.mock('@socketsecurity/lib/fs', () => ({
   readJson: vi.fn(),
+  safeMkdir: vi.fn(),
   writeJson: vi.fn(),
 }))
 
@@ -90,7 +91,7 @@ describe('ghsa-tracker', () => {
 
   describe('saveGhsaTracker', () => {
     it('saves tracker to file', async () => {
-      const { writeJson } = await import('@socketsecurity/lib/fs')
+      const { safeMkdir, writeJson } = await import('@socketsecurity/lib/fs')
       const tracker: GhsaTracker = {
         version: 1,
         fixed: [
@@ -105,7 +106,7 @@ describe('ghsa-tracker', () => {
 
       await saveGhsaTracker(mockCwd, tracker)
 
-      expect(fs.mkdir).toHaveBeenCalledWith(path.dirname(trackerPath), {
+      expect(safeMkdir).toHaveBeenCalledWith(path.dirname(trackerPath), {
         recursive: true,
       })
       expect(writeJson).toHaveBeenCalledWith(trackerPath, tracker, {

packages/cli/src/commands/scan/fetch-create-org-full-scan.test.mts

@@ -49,17 +49,15 @@ describe('fetchCreateOrgFullScan', () => {
       ['/path/to/package.json'],
       {
         pathsRelativeTo: process.cwd(),
-        queryParams: {
-          branch: 'main',
-          commit_hash: 'abc123',
-          commit_message: 'Initial commit',
-          committers: '[email protected]',
-          make_default_branch: 'undefined',
-          pull_request: '42',
-          repo: 'test-repo',
-          set_as_pending_head: 'undefined',
-          tmp: 'undefined',
-        },
+        branch: 'main',
+        commit_hash: 'abc123',
+        commit_message: 'Initial commit',
+        committers: '[email protected]',
+        make_default_branch: 'undefined',
+        pull_request: '42',
+        repo: 'test-repo',
+        set_as_pending_head: 'undefined',
+        tmp: 'undefined',
       },
     )
     expect(mockHandleApi).toHaveBeenCalledWith(expect.any(Promise), {
@@ -169,17 +167,15 @@ describe('fetchCreateOrgFullScan', () => {
       ['/path/to/package.json'],
       {
         pathsRelativeTo: '/custom/path',
-        queryParams: {
-          branch: 'develop',
-          commit_hash: 'xyz789',
-          commit_message: 'Feature commit',
-          committers: '[email protected]',
-          make_default_branch: 'true',
-          pull_request: '123',
-          repo: 'feature-repo',
-          set_as_pending_head: 'false',
-          tmp: 'true',
-        },
+        branch: 'develop',
+        commit_hash: 'xyz789',
+        commit_message: 'Feature commit',
+        committers: '[email protected]',
+        make_default_branch: 'true',
+        pull_request: '123',
+        repo: 'feature-repo',
+        set_as_pending_head: 'false',
+        tmp: 'true',
       },
     )
   })
@@ -207,12 +203,10 @@ describe('fetchCreateOrgFullScan', () => {
       ['/path/to/package.json'],
       {
         pathsRelativeTo: process.cwd(),
-        queryParams: {
-          make_default_branch: 'undefined',
-          repo: 'test-repo',
-          set_as_pending_head: 'undefined',
-          tmp: 'undefined',
-        },
+        make_default_branch: 'undefined',
+        repo: 'test-repo',
+        set_as_pending_head: 'undefined',
+        tmp: 'undefined',
       },
     )
   })
@@ -246,7 +240,6 @@ describe('fetchCreateOrgFullScan', () => {
       packagePaths,
       expect.objectContaining({
         pathsRelativeTo: process.cwd(),
-        queryParams: expect.any(Object),
       }),
     )
   })
@@ -305,9 +298,7 @@ describe('fetchCreateOrgFullScan', () => {
         ['/path/to/package.json'],
         expect.objectContaining({
           pathsRelativeTo: process.cwd(),
-          queryParams: expect.objectContaining({
-            repo,
-          }),
+          repo,
         }),
       )
     }

packages/cli/src/utils/git/providers.test.mts

@@ -24,17 +24,19 @@ vi.mock('./operations.mts', () => ({
 }))
 
 vi.mock('@gitbeaker/rest', () => ({
-  Gitlab: vi.fn(() => ({
-    MergeRequests: {
-      create: vi.fn(),
-      show: vi.fn(),
-      rebase: vi.fn(),
-      all: vi.fn(),
-    },
-    MergeRequestNotes: {
-      create: vi.fn(),
-    },
-  })),
+  Gitlab: vi.fn(function () {
+    return {
+      MergeRequests: {
+        create: vi.fn(),
+        show: vi.fn(),
+        rebase: vi.fn(),
+        all: vi.fn(),
+      },
+      MergeRequestNotes: {
+        create: vi.fn(),
+      },
+    }
+  }),
 }))
 
 describe('provider-factory', () => {

packages/cli/src/utils/npm/config.test.mts

@@ -12,7 +12,9 @@ const mockNpmConfigInstance = {
 
 // Mock @npmcli/config.
 vi.mock('@npmcli/config', () => ({
-  default: vi.fn(() => mockNpmConfigInstance),
+  default: vi.fn(function () {
+    return mockNpmConfigInstance
+  }),
 }))
 
 import { getNpmConfig } from './config.mts'
@@ -37,7 +39,9 @@ describe('npm-config utilities', () => {
   beforeEach(() => {
     // Clear mock calls and restore original implementation
     MockNpmConfig.mockClear()
-    MockNpmConfig.mockImplementation(() => mockNpmConfigInstance)
+    MockNpmConfig.mockImplementation(function () {
+      return mockNpmConfigInstance
+    })
     vi.mocked(mockNpmConfigInstance.load).mockClear()
   })
 
@@ -138,7 +142,9 @@ describe('npm-config utilities', () => {
         flat: { test: 'value' },
       }
       vi.mocked((await import('@npmcli/config')).default).mockImplementation(
-        () => mockConfigInstance,
+        function () {
+          return mockConfigInstance
+        },
       )
 
       await getNpmConfig()