@dk/jolly 0.1.5 → 0.1.7

package/src/test/entry-points.test.ts

@@ -50,7 +50,10 @@ describe('Entry Points', () => {
       When('bootstrap calls createStore', () => {
         Then('it should pass project name and default region', async () => {
           withToken();
-          mockFetch({ '/stores': { store: fixtures.store } });
+          mockFetch({
+            '/organizations': { organizations: [fixtures.organization] },
+            '/organizations/my-org/projects': { project: fixtures.project },
+          });
 
           const { createStore } = await import('../commands/store');
           await createStore('my-project', 'us-east-1');

package/src/test/error-handling.test.ts

@@ -76,7 +76,7 @@ describe('Error Handling', () => {
           const { SaleorCloudClient } = await import('../api/client');
           const client = new SaleorCloudClient(fixtures.token);
 
-          await expect(client.getStores()).rejects.toThrow('401');
+          await expect(client.getOrganizations()).rejects.toThrow('401');
         });
       });
 
@@ -87,7 +87,7 @@ describe('Error Handling', () => {
           const { SaleorCloudClient } = await import('../api/client');
           const client = new SaleorCloudClient(fixtures.token);
 
-          await expect(client.createStore('test', 'us-east-1')).rejects.toThrow('403');
+          await expect(client.createProject('test-org', 'test', 'us-east-1')).rejects.toThrow('403');
         });
       });
 
@@ -98,7 +98,7 @@ describe('Error Handling', () => {
           const { SaleorCloudClient } = await import('../api/client');
           const client = new SaleorCloudClient(fixtures.token);
 
-          await expect(client.getEnvironments('store-1')).rejects.toThrow('500');
+          await expect(client.getEnvironments('test-org', 'test-project')).rejects.toThrow('500');
         });
       });
 
@@ -109,7 +109,7 @@ describe('Error Handling', () => {
           const { SaleorCloudClient } = await import('../api/client');
           const client = new SaleorCloudClient(fixtures.token);
 
-          await expect(client.createEnvironment('bad-id', 'staging')).rejects.toThrow('404');
+          await expect(client.createEnvironment('bad-org', 'bad-project', 'staging', 'us-east-1')).rejects.toThrow('404');
         });
       });
     });
@@ -118,17 +118,17 @@ describe('Error Handling', () => {
   describe('API Request Headers', () => {
     Given('a SaleorCloudClient with a token', () => {
       When('making any request', () => {
-        Then('it should include Authorization Bearer header', async () => {
+        Then('it should include Authorization Token header', async () => {
           const fetchMock = mockFetch({
-            '/stores': { stores: [] },
+            '/organizations': { organizations: [] },
           });
 
           const { SaleorCloudClient } = await import('../api/client');
           const client = new SaleorCloudClient(fixtures.token);
-          await client.getStores();
+          await client.getOrganizations();
 
           const [, opts] = fetchMock.mock.calls[0];
-          expect(opts.headers.Authorization).toBe(`Bearer ${fixtures.token}`);
+          expect(opts.headers.Authorization).toBe(`Token ${fixtures.token}`);
           expect(opts.headers['Content-Type']).toBe('application/json');
         });
       });

package/src/test/mocks.ts

@@ -1,44 +1,84 @@
 import { mock, spyOn } from 'bun:test';
-import type { Store, Environment, App } from '../api/client';
+import type { Organization, Project, Environment, App } from '../api/client';
 
 export const fixtures = {
   token: 'test-token-abc123',
 
-  store: {
-    id: 'store-1',
+  // New API structure: Organizations → Projects → Environments
+  organization: {
+    slug: 'my-org',
+    name: 'My Organization',
+    created: '2025-01-01T00:00:00Z',
+    owner_email: 'owner@example.com',
+    company_name: 'My Company',
+  } satisfies Organization,
+
+  organization2: {
+    slug: 'other-org',
+    name: 'Other Organization',
+    created: '2025-06-15T00:00:00Z',
+    owner_email: 'other@example.com',
+  } satisfies Organization,
+
+  project: {
+    slug: 'my-store',
     name: 'my-store',
     region: 'us-east-1',
-    created_at: '2025-01-01T00:00:00Z',
-  } satisfies Store,
+    created: '2025-01-01T00:00:00Z',
+    sandboxes: { count: 2 },
+  } satisfies Project,
 
-  store2: {
-    id: 'store-2',
+  project2: {
+    slug: 'other-store',
     name: 'other-store',
     region: 'eu-west-1',
-    created_at: '2025-06-15T00:00:00Z',
-  } satisfies Store,
+    created: '2025-06-15T00:00:00Z',
+    sandboxes: { count: 1 },
+  } satisfies Project,
 
   environment: {
-    id: 'env-1',
+    key: 'staging',
     name: 'staging',
-    store_id: 'store-1',
-    created_at: '2025-01-02T00:00:00Z',
+    domain: 'staging-my-store.saleor.cloud',
+    service: {
+      version: '3.15.0',
+      type: 'main',
+      region: 'us-east-1',
+    },
+    created: '2025-01-02T00:00:00Z',
+    project: { name: 'my-store', slug: 'my-store' },
   } satisfies Environment,
 
   app: {
     id: 'app-1',
     name: 'my-app',
     type: 'payment',
-    environment_id: 'env-1',
+    environment_id: 'staging',
   } satisfies App,
+
+  // Backward compat aliases (for tests that haven't been migrated yet)
+  store: {
+    id: 'my-org',
+    name: 'My Organization',
+    region: 'us-east-1',
+    created_at: '2025-01-01T00:00:00Z',
+  },
+  store2: {
+    id: 'other-org',
+    name: 'Other Organization',
+    region: 'eu-west-1',
+    created_at: '2025-06-15T00:00:00Z',
+  },
 };
 
 export function mockFetch(routes: Record<string, unknown>): ReturnType<typeof mock> {
   const handler = mock((url: string | URL | Request, init?: RequestInit) => {
     const urlStr = typeof url === 'string' ? url : url instanceof URL ? url.toString() : url.url;
 
-    for (const [pattern, body] of Object.entries(routes)) {
-      if (urlStr.includes(pattern)) {
+    const sortedEntries = Object.entries(routes).sort((a, b) => b[0].length - a[0].length);
+
+    for (const [pattern, body] of sortedEntries) {
+      if (urlStr.endsWith(pattern)) {
         return Promise.resolve(new Response(JSON.stringify(body), {
           status: 200,
           headers: { 'Content-Type': 'application/json' },