Skip to content

Commit a96993e

Browse files
committed
fix more instances of 2026-01
1 parent efc420b commit a96993e

File tree

3 files changed

+15
-8
lines changed

3 files changed

+15
-8
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ const remoteApp = {
4444

4545
beforeEach(() => {
4646
vi.mocked(ensureAuthenticatedAdminAsApp).mockResolvedValue({token: 'test-token', storeFqdn})
47-
vi.mocked(resolveApiVersion).mockResolvedValue('2026-01')
47+
vi.mocked(resolveApiVersion).mockResolvedValue(BULK_OPERATIONS_MIN_API_VERSION)
4848
})
4949

5050
afterEach(() => {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import {formatBulkOperationStatus} from './format-bulk-operation-status.js'
2+
import {BULK_OPERATIONS_MIN_API_VERSION} from './constants.js'
23
import {
34
GetBulkOperationById,
45
GetBulkOperationByIdQuery,
@@ -14,7 +15,6 @@ const TERMINAL_STATUSES = ['COMPLETED', 'FAILED', 'CANCELED', 'EXPIRED']
1415
const INITIAL_POLL_INTERVAL_SECONDS = 1
1516
const REGULAR_POLL_INTERVAL_SECONDS = 5
1617
const INITIAL_POLL_COUNT = 10
17-
const API_VERSION = '2026-01'
1818

1919
export const QUICK_WATCH_TIMEOUT_MS = 3000
2020
export const QUICK_WATCH_POLL_INTERVAL_MS = 300
@@ -146,6 +146,6 @@ async function fetchBulkOperation(adminSession: AdminSession, operationId: strin
146146
query: GetBulkOperationById,
147147
session: adminSession,
148148
variables: {id: operationId},
149-
version: API_VERSION,
149+
version: BULK_OPERATIONS_MIN_API_VERSION,
150150
})
151151
}

packages/app/src/cli/services/graphql/common.test.ts

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import {createAdminSessionAsApp, formatOperationInfo, resolveApiVersion, validateSingleOperation} from './common.js'
22
import {OrganizationApp} from '../../models/organization.js'
3+
import {BULK_OPERATIONS_MIN_API_VERSION} from '../bulk-operations/constants.js'
34
import {ensureAuthenticatedAdminAsApp} from '@shopify/cli-kit/node/session'
45
import {fetchApiVersions} from '@shopify/cli-kit/node/api/admin'
56
import {describe, test, expect, vi, beforeEach} from 'vitest'
@@ -126,7 +127,7 @@ describe('resolveApiVersion', () => {
126127
const result = await resolveApiVersion({
127128
adminSession: mockAdminSession,
128129
userSpecifiedVersion: '2024-04',
129-
minimumDefaultVersion: '2026-01',
130+
minimumDefaultVersion: BULK_OPERATIONS_MIN_API_VERSION,
130131
})
131132

132133
expect(result).toBe('2024-04')
@@ -181,21 +182,27 @@ describe('resolveApiVersion', () => {
181182
{handle: '2025-10', supported: true},
182183
])
183184

184-
const result = await resolveApiVersion({adminSession: mockAdminSession, minimumDefaultVersion: '2026-01'})
185+
const result = await resolveApiVersion({
186+
adminSession: mockAdminSession,
187+
minimumDefaultVersion: BULK_OPERATIONS_MIN_API_VERSION,
188+
})
185189

186-
expect(result).toBe('2026-01')
190+
expect(result).toBe(BULK_OPERATIONS_MIN_API_VERSION)
187191
expect(fetchApiVersions).toHaveBeenCalledWith(mockAdminSession)
188192
})
189193

190194
test('returns most recent supported version when newer than minimum version', async () => {
191195
vi.mocked(fetchApiVersions).mockResolvedValue([
192-
{handle: '2026-01', supported: true},
196+
{handle: BULK_OPERATIONS_MIN_API_VERSION, supported: true},
193197
{handle: '2026-04', supported: true},
194198
{handle: '2026-07', supported: true},
195199
{handle: '2027-01', supported: false},
196200
])
197201

198-
const result = await resolveApiVersion({adminSession: mockAdminSession, minimumDefaultVersion: '2026-01'})
202+
const result = await resolveApiVersion({
203+
adminSession: mockAdminSession,
204+
minimumDefaultVersion: BULK_OPERATIONS_MIN_API_VERSION,
205+
})
199206

200207
expect(result).toBe('2026-07')
201208
expect(fetchApiVersions).toHaveBeenCalledWith(mockAdminSession)

0 commit comments

Comments
 (0)