Skip to content

Commit b1366ab

Browse files
committed
refactor: update BASE_URL in ObjectForm and ObjectGrid tests to use environment variable; conditionally start MSW server
1 parent b43bfb8 commit b1366ab

File tree

4 files changed

+18
-13
lines changed

4 files changed

+18
-13
lines changed

examples/crm/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010
"./objectstack.config": "./objectstack.config.ts"
1111
},
1212
"scripts": {
13-
"build": "objectstack compile objectstack.config.ts dist/objectstack.json"
13+
"build": "objectstack compile objectstack.config.ts dist/objectstack.json",
14+
"dev": "objectstack dev"
1415
},
1516
"dependencies": {
1617
"@objectstack/spec": "^0.8.0"

package.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,7 @@
1818
"scripts": {
1919
"dev": "pnpm --filter @object-ui/console dev",
2020
"dev:console": "pnpm --filter @object-ui/console dev",
21-
"dev:crm": "pnpm --filter @examples/crm-app dev",
2221
"build": "turbo run build",
23-
"build:old": "pnpm --filter './packages/*' -r build && pnpm --filter './examples/*' -r build && pnpm --filter './apps/*' -r build",
2422
"pretest": "turbo run build --filter=@object-ui/types --filter=@object-ui/core --filter=@object-ui/react --filter=@object-ui/components --filter=@object-ui/fields --filter=@object-ui/layout --filter=@object-ui/plugin-kanban --filter=@object-ui/plugin-charts --filter=@object-ui/plugin-form --filter=@object-ui/plugin-grid --filter=@object-ui/plugin-dashboard",
2523
"test": "turbo run test",
2624
"test:root": "vitest run",

packages/plugin-form/src/ObjectForm.msw.test.tsx

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import { ContactObject } from '../../../examples/crm/src/objects/contact.object'
1212
// Register widget renderers
1313
registerAllFields();
1414

15-
const BASE_URL = 'http://test-api.com';
15+
const BASE_URL = process.env.OBJECTSTACK_API_URL || 'http://test-api.com';
1616

1717
// --- Mock Data ---
1818

@@ -69,11 +69,14 @@ const server = setupServer(...handlers);
6969
// --- Test Suite ---
7070

7171
describe('ObjectForm with ObjectStack/MSW', () => {
72-
beforeAll(() => server.listen());
73-
afterEach(() => server.resetHandlers());
74-
afterAll(() => server.close());
75-
76-
// Create real adapter instance pointing to MSW
72+
// Only start MSW if we are NOT using a real server
73+
if (!process.env.OBJECTSTACK_API_URL) {
74+
beforeAll(() => server.listen());
75+
afterEach(() => server.resetHandlers());
76+
afterAll(() => server.close());
77+
}
78+
79+
// Create real adapter instance pointing to MSW or Real Server
7780
const dataSource = new ObjectStackAdapter({
7881
baseUrl: BASE_URL,
7982
// Add custom fetch for environment that might need it, or rely on global fetch

packages/plugin-grid/src/ObjectGrid.msw.test.tsx

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import { ContactObject } from '../../../examples/crm/src/objects/contact.object'
1111

1212
registerAllFields();
1313

14-
const BASE_URL = 'http://test-api.com';
14+
const BASE_URL = process.env.OBJECTSTACK_API_URL || 'http://test-api.com';
1515

1616
// --- Mock Data ---
1717

@@ -63,9 +63,12 @@ const server = setupServer(...handlers);
6363
// --- Test Suite ---
6464

6565
describe('ObjectGrid with ObjectStack/MSW', () => {
66-
beforeAll(() => server.listen());
67-
afterEach(() => server.resetHandlers());
68-
afterAll(() => server.close());
66+
// Only start MSW if we are NOT using a real server
67+
if (!process.env.OBJECTSTACK_API_URL) {
68+
beforeAll(() => server.listen());
69+
afterEach(() => server.resetHandlers());
70+
afterAll(() => server.close());
71+
}
6972

7073
const dataSource = new ObjectStackAdapter({
7174
baseUrl: BASE_URL,

0 commit comments

Comments
 (0)