better testing of resolveApiVersion use

Author: nickwesselman

packages/app/src/cli/services/bulk-operations/bulk-operation-status.test.ts

@@ -179,7 +179,7 @@ describe('getBulkOperationStatus', () => {
     expect(output.info()).toContain('Bulk operation canceled.')
   })
 
-  test('calls resolveApiVersion with minimum API version', async () => {
+  test('calls resolveApiVersion with minimum API version constant', async () => {
     vi.mocked(adminRequestDoc).mockResolvedValue(mockBulkOperation({status: 'RUNNING'}))
 
     await getBulkOperationStatus({organization: mockOrganization, storeFqdn, operationId, remoteApp})
@@ -191,6 +191,19 @@ describe('getBulkOperationStatus', () => {
     )
   })
 
+  test('uses resolved API version in admin request', async () => {
+    vi.mocked(resolveApiVersion).mockResolvedValue('test-api-version')
+    vi.mocked(adminRequestDoc).mockResolvedValue(mockBulkOperation({status: 'RUNNING'}))
+
+    await getBulkOperationStatus({organization: mockOrganization, storeFqdn, operationId, remoteApp})
+
+    expect(adminRequestDoc).toHaveBeenCalledWith(
+      expect.objectContaining({
+        version: 'test-api-version',
+      }),
+    )
+  })
+
   describe('time formatting', () => {
     test('uses "Started" for running operations', async () => {
       vi.mocked(adminRequestDoc).mockResolvedValue(mockBulkOperation({status: 'RUNNING'}))
@@ -351,7 +364,7 @@ describe('listBulkOperations', () => {
     expect(output.info()).toContain('No bulk operations found in the last 7 days.')
   })
 
-  test('calls resolveApiVersion with minimum API version', async () => {
+  test('calls resolveApiVersion with minimum API version constant', async () => {
     vi.mocked(adminRequestDoc).mockResolvedValue(mockBulkOperationsList([]))
 
     await listBulkOperations({organization: mockOrganization, storeFqdn, remoteApp})
@@ -362,4 +375,17 @@ describe('listBulkOperations', () => {
       BULK_OPERATIONS_MIN_API_VERSION,
     )
   })
+
+  test('uses resolved API version in admin request', async () => {
+    vi.mocked(resolveApiVersion).mockResolvedValue('test-api-version')
+    vi.mocked(adminRequestDoc).mockResolvedValue(mockBulkOperationsList([]))
+
+    await listBulkOperations({organization: mockOrganization, storeFqdn, remoteApp})
+
+    expect(adminRequestDoc).toHaveBeenCalledWith(
+      expect.objectContaining({
+        version: 'test-api-version',
+      }),
+    )
+  })
 })

packages/app/src/cli/services/bulk-operations/execute-bulk-operation.test.ts

@@ -3,6 +3,7 @@ import {runBulkOperationQuery} from './run-query.js'
 import {runBulkOperationMutation} from './run-mutation.js'
 import {watchBulkOperation, shortBulkOperationPoll} from './watch-bulk-operation.js'
 import {downloadBulkOperationResults} from './download-bulk-operation-results.js'
+import {BULK_OPERATIONS_MIN_API_VERSION} from './constants.js'
 import {resolveApiVersion} from '../graphql/common.js'
 import {BulkOperationRunQueryMutation} from '../../api/graphql/bulk-operations/generated/bulk-operation-run-query.js'
 import {BulkOperationRunMutationMutation} from '../../api/graphql/bulk-operations/generated/bulk-operation-run-mutation.js'
@@ -675,4 +676,45 @@ describe('executeBulkOperation', () => {
       }),
     )
   })
+
+  test('calls resolveApiVersion with minimum API version constant', async () => {
+    const query = '{ products { edges { node { id } } } }'
+    const mockResponse: BulkOperationRunQueryMutation['bulkOperationRunQuery'] = {
+      bulkOperation: createdBulkOperation,
+      userErrors: [],
+    }
+    vi.mocked(runBulkOperationQuery).mockResolvedValue(mockResponse)
+
+    await executeBulkOperation({
+      organization: mockOrganization,
+      remoteApp: mockRemoteApp,
+      storeFqdn,
+      query,
+    })
+
+    expect(resolveApiVersion).toHaveBeenCalledWith(mockAdminSession, undefined, BULK_OPERATIONS_MIN_API_VERSION)
+  })
+
+  test('uses resolved API version when running bulk operation', async () => {
+    vi.mocked(resolveApiVersion).mockResolvedValue('test-api-version')
+    const query = '{ products { edges { node { id } } } }'
+    const mockResponse: BulkOperationRunQueryMutation['bulkOperationRunQuery'] = {
+      bulkOperation: createdBulkOperation,
+      userErrors: [],
+    }
+    vi.mocked(runBulkOperationQuery).mockResolvedValue(mockResponse)
+
+    await executeBulkOperation({
+      organization: mockOrganization,
+      remoteApp: mockRemoteApp,
+      storeFqdn,
+      query,
+    })
+
+    expect(runBulkOperationQuery).toHaveBeenCalledWith({
+      adminSession: mockAdminSession,
+      query,
+      version: 'test-api-version',
+    })
+  })
 })