Skip to content

Commit 1a0b3b9

Browse files
jiashengguojiashengguo
committed
test: fix test failing in windows
1 parent d7dbba9 commit 1a0b3b9

File tree

12 files changed

+53
-50
lines changed

12 files changed

+53
-50
lines changed

‎packages/language/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"generate": "langium generate && npx ts-node script/generate-plist.ts",
1010
"watch": "concurrently \"langium generate --watch\" \"tsc --watch\"",
1111
"lint": "eslint src --ext ts",
12-
"build": "pnpm lint --max-warnings=0 && pnpm clean && pnpm generate && tsc && copyfiles -F ./README.md ./LICENSE ./package.json 'syntaxes/**/*' dist && pnpm pack dist --pack-destination '../../../.build'",
12+
"build": "pnpm lint --max-warnings=0 && pnpm clean && pnpm generate && tsc && copyfiles -F ./README.md ./LICENSE ./package.json 'syntaxes/**/*' dist && pnpm pack dist --pack-destination ../../../.build",
1313
"prepublishOnly": "pnpm build"
1414
},
1515
"publishConfig": {

‎packages/misc/redwood/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
},
1010
"scripts": {
1111
"clean": "rimraf dist",
12-
"build": "pnpm lint --max-warnings=0 && pnpm clean && tsc && pnpm pack dist --pack-destination '../../../.build'",
12+
"build": "pnpm lint --max-warnings=0 && pnpm clean && tsc && pnpm pack dist --pack-destination ../../../.build",
1313
"watch": "tsc --watch",
1414
"lint": "eslint src --ext ts",
1515
"prepublishOnly": "pnpm build"

‎packages/plugins/openapi/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
},
1515
"scripts": {
1616
"clean": "rimraf dist",
17-
"build": "pnpm lint --max-warnings=0 && pnpm clean && tsc && copyfiles ./package.json ./README.md ./LICENSE dist && copyfiles -u 1 ./src/plugin.zmodel dist && pnpm pack dist --pack-destination '../../../../.build'",
17+
"build": "pnpm lint --max-warnings=0 && pnpm clean && tsc && copyfiles ./package.json ./README.md ./LICENSE dist && copyfiles -u 1 ./src/plugin.zmodel dist && pnpm pack dist --pack-destination ../../../../.build",
1818
"watch": "tsc --watch",
1919
"lint": "eslint src --ext ts",
2020
"test": "jest",

‎packages/plugins/openapi/tests/openapi-restful.test.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import OpenAPIParser from '@readme/openapi-parser';
55
import { getLiteral, getObjectLiteral } from '@zenstackhq/sdk';
66
import { Model, Plugin, isPlugin } from '@zenstackhq/sdk/ast';
7-
import { loadZModelAndDmmf } from '@zenstackhq/testtools';
7+
import { loadZModelAndDmmf, normalizePath } from '@zenstackhq/testtools';
88
import fs from 'fs';
99
import path from 'path';
1010
import * as tmp from 'tmp';
@@ -16,7 +16,7 @@ describe('Open API Plugin RESTful Tests', () => {
1616
for (const specVersion of ['3.0.0', '3.1.0']) {
1717
const { model, dmmf, modelFile } = await loadZModelAndDmmf(`
1818
plugin openapi {
19-
provider = '${path.resolve(__dirname, '../dist')}'
19+
provider = '${normalizePath(path.resolve(__dirname, '../dist'))}'
2020
specVersion = '${specVersion}'
2121
}
2222
@@ -114,7 +114,7 @@ model Bar {
114114
it('options', async () => {
115115
const { model, dmmf, modelFile } = await loadZModelAndDmmf(`
116116
plugin openapi {
117-
provider = '${path.resolve(__dirname, '../dist')}'
117+
provider = '${normalizePath(path.resolve(__dirname, '../dist'))}'
118118
specVersion = '3.0.0'
119119
title = 'My Awesome API'
120120
version = '1.0.0'
@@ -151,7 +151,7 @@ model User {
151151
it('security schemes valid', async () => {
152152
const { model, dmmf, modelFile } = await loadZModelAndDmmf(`
153153
plugin openapi {
154-
provider = '${path.resolve(__dirname, '../dist')}'
154+
provider = '${normalizePath(path.resolve(__dirname, '../dist'))}'
155155
securitySchemes = {
156156
myBasic: { type: 'http', scheme: 'basic' },
157157
myBearer: { type: 'http', scheme: 'bearer', bearerFormat: 'JWT' },
@@ -198,7 +198,7 @@ model Post {
198198
it('security model level override', async () => {
199199
const { model, dmmf, modelFile } = await loadZModelAndDmmf(`
200200
plugin openapi {
201-
provider = '${path.resolve(__dirname, '../dist')}'
201+
provider = '${normalizePath(path.resolve(__dirname, '../dist'))}'
202202
securitySchemes = {
203203
myBasic: { type: 'http', scheme: 'basic' }
204204
}
@@ -230,7 +230,7 @@ model User {
230230
it('security schemes invalid', async () => {
231231
const { model, dmmf, modelFile } = await loadZModelAndDmmf(`
232232
plugin openapi {
233-
provider = '${path.resolve(__dirname, '../dist')}'
233+
provider = '${normalizePath(path.resolve(__dirname, '../dist'))}'
234234
securitySchemes = {
235235
myBasic: { type: 'invalid', scheme: 'basic' }
236236
}
@@ -251,7 +251,7 @@ model User {
251251
it('ignored model used as relation', async () => {
252252
const { model, dmmf, modelFile } = await loadZModelAndDmmf(`
253253
plugin openapi {
254-
provider = '${path.resolve(__dirname, '../dist')}'
254+
provider = '${normalizePath(path.resolve(__dirname, '../dist'))}'
255255
}
256256
257257
model User {
@@ -284,7 +284,7 @@ model Post {
284284
for (const specVersion of ['3.0.0', '3.1.0']) {
285285
const { model, dmmf, modelFile } = await loadZModelAndDmmf(`
286286
plugin openapi {
287-
provider = '${path.resolve(__dirname, '../dist')}'
287+
provider = '${normalizePath(path.resolve(__dirname, '../dist'))}'
288288
specVersion = '${specVersion}'
289289
}
290290

‎packages/plugins/openapi/tests/openapi-rpc.test.ts

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import OpenAPIParser from '@readme/openapi-parser';
55
import { getLiteral, getObjectLiteral } from '@zenstackhq/sdk';
66
import { Model, Plugin, isPlugin } from '@zenstackhq/sdk/ast';
7-
import { loadZModelAndDmmf } from '@zenstackhq/testtools';
7+
import { loadZModelAndDmmf, normalizePath } from '@zenstackhq/testtools';
88
import fs from 'fs';
99
import path from 'path';
1010
import * as tmp from 'tmp';
@@ -16,7 +16,7 @@ describe('Open API Plugin RPC Tests', () => {
1616
for (const specVersion of ['3.0.0', '3.1.0']) {
1717
const { model, dmmf, modelFile } = await loadZModelAndDmmf(`
1818
plugin openapi {
19-
provider = '${path.resolve(__dirname, '../dist')}'
19+
provider = '${normalizePath(path.resolve(__dirname, '../dist'))}'
2020
specVersion = '${specVersion}'
2121
}
2222
@@ -127,7 +127,7 @@ model Bar {
127127
it('options', async () => {
128128
const { model, dmmf, modelFile } = await loadZModelAndDmmf(`
129129
plugin openapi {
130-
provider = '${path.resolve(__dirname, '../dist')}'
130+
provider = '${normalizePath(path.resolve(__dirname, '../dist'))}'
131131
specVersion = '3.0.0'
132132
title = 'My Awesome API'
133133
version = '1.0.0'
@@ -164,7 +164,7 @@ model User {
164164
it('security schemes valid', async () => {
165165
const { model, dmmf, modelFile } = await loadZModelAndDmmf(`
166166
plugin openapi {
167-
provider = '${path.resolve(__dirname, '../dist')}'
167+
provider = '${normalizePath(path.resolve(__dirname, '../dist'))}'
168168
securitySchemes = {
169169
myBasic: { type: 'http', scheme: 'basic' },
170170
myBearer: { type: 'http', scheme: 'bearer', bearerFormat: 'JWT' },
@@ -198,7 +198,7 @@ model User {
198198
it('security schemes invalid', async () => {
199199
const { model, dmmf, modelFile } = await loadZModelAndDmmf(`
200200
plugin openapi {
201-
provider = '${path.resolve(__dirname, '../dist')}'
201+
provider = '${normalizePath(path.resolve(__dirname, '../dist'))}'
202202
securitySchemes = {
203203
myBasic: { type: 'invalid', scheme: 'basic' }
204204
}
@@ -219,7 +219,7 @@ model User {
219219
it('security model level override', async () => {
220220
const { model, dmmf, modelFile } = await loadZModelAndDmmf(`
221221
plugin openapi {
222-
provider = '${path.resolve(__dirname, '../dist')}'
222+
provider = '${normalizePath(path.resolve(__dirname, '../dist'))}'
223223
securitySchemes = {
224224
myBasic: { type: 'http', scheme: 'basic' }
225225
}
@@ -247,7 +247,7 @@ model User {
247247
it('security operation level override', async () => {
248248
const { model, dmmf, modelFile } = await loadZModelAndDmmf(`
249249
plugin openapi {
250-
provider = '${path.resolve(__dirname, '../dist')}'
250+
provider = '${normalizePath(path.resolve(__dirname, '../dist'))}'
251251
securitySchemes = {
252252
myBasic: { type: 'http', scheme: 'basic' }
253253
}
@@ -280,7 +280,7 @@ model User {
280280
it('security inferred', async () => {
281281
const { model, dmmf, modelFile } = await loadZModelAndDmmf(`
282282
plugin openapi {
283-
provider = '${path.resolve(__dirname, '../dist')}'
283+
provider = '${normalizePath(path.resolve(__dirname, '../dist'))}'
284284
securitySchemes = {
285285
myBasic: { type: 'http', scheme: 'basic' }
286286
}
@@ -306,7 +306,7 @@ model User {
306306
it('v3.1.0 fields', async () => {
307307
const { model, dmmf, modelFile } = await loadZModelAndDmmf(`
308308
plugin openapi {
309-
provider = '${path.resolve(__dirname, '../dist')}'
309+
provider = '${normalizePath(path.resolve(__dirname, '../dist'))}'
310310
summary = 'awesome api'
311311
}
312312
@@ -330,7 +330,7 @@ model User {
330330
it('ignored model used as relation', async () => {
331331
const { model, dmmf, modelFile } = await loadZModelAndDmmf(`
332332
plugin openapi {
333-
provider = '${path.resolve(__dirname, '../dist')}'
333+
provider = '${normalizePath(path.resolve(__dirname, '../dist'))}'
334334
}
335335
336336
model User {
@@ -362,7 +362,7 @@ model Post {
362362
for (const specVersion of ['3.0.0', '3.1.0']) {
363363
const { model, dmmf, modelFile } = await loadZModelAndDmmf(`
364364
plugin openapi {
365-
provider = '${path.resolve(__dirname, '../dist')}'
365+
provider = '${normalizePath(path.resolve(__dirname, '../dist'))}'
366366
specVersion = '${specVersion}'
367367
}
368368
@@ -408,7 +408,7 @@ generator js {
408408
}
409409
410410
plugin openapi {
411-
provider = '${path.resolve(__dirname, '../dist')}'
411+
provider = '${normalizePath(path.resolve(__dirname, '../dist'))}'
412412
}
413413
414414
enum role {

‎packages/plugins/swr/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
},
1111
"scripts": {
1212
"clean": "rimraf dist",
13-
"build": "pnpm lint --max-warnings=0 && pnpm clean && tsc && tsup-node --config ./tsup.config.ts && copyfiles ./package.json ./README.md ./LICENSE dist && pnpm pack dist --pack-destination '../../../../.build'",
13+
"build": "pnpm lint --max-warnings=0 && pnpm clean && tsc && tsup-node --config ./tsup.config.ts && copyfiles ./package.json ./README.md ./LICENSE dist && pnpm pack dist --pack-destination ../../../../.build",
1414
"watch": "concurrently \"tsc --watch\" \"tsup-node --config ./tsup.config.ts --watch\"",
1515
"lint": "eslint src --ext ts",
1616
"test": "jest",

‎packages/plugins/swr/tests/swr.test.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/// <reference types="@types/jest" />
22

3-
import { loadSchema } from '@zenstackhq/testtools';
3+
import { loadSchema, normalizePath } from '@zenstackhq/testtools';
44
import path from 'path';
55

66
describe('SWR Plugin Tests', () => {
@@ -50,7 +50,7 @@ model Foo {
5050
await loadSchema(
5151
`
5252
plugin swr {
53-
provider = '${path.resolve(__dirname, '../dist')}'
53+
provider = '${normalizePath(path.resolve(__dirname, '../dist'))}'
5454
output = '$projectRoot/hooks'
5555
}
5656
@@ -60,7 +60,7 @@ ${sharedModel}
6060
provider: 'postgresql',
6161
pushDb: false,
6262
extraDependencies: [
63-
`${path.join(__dirname, '../dist')}`,
63+
`${normalizePath(path.join(__dirname, '../dist'))}`,
6464
'react@18.2.0',
6565
'@types/react@18.2.0',
6666
'swr@^2',

‎packages/plugins/tanstack-query/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
},
6767
"scripts": {
6868
"clean": "rimraf dist",
69-
"build": "pnpm lint --max-warnings=0 && pnpm clean && tsc && tsup-node --config ./tsup.config.ts && tsup-node --config ./tsup-v5.config.ts && node scripts/postbuild && copyfiles ./package.json ./README.md ./LICENSE dist && pnpm pack dist --pack-destination '../../../../.build'",
69+
"build": "pnpm lint --max-warnings=0 && pnpm clean && tsc && tsup-node --config ./tsup.config.ts && tsup-node --config ./tsup-v5.config.ts && node scripts/postbuild && copyfiles ./package.json ./README.md ./LICENSE dist && pnpm pack dist --pack-destination ../../../../.build",
7070
"watch": "concurrently \"tsc --watch\" \"tsup-node --config ./tsup.config.ts --watch\" \"tsup-node --config ./tsup-v5.config.ts --watch\"",
7171
"lint": "eslint src --ext ts",
7272
"test": "jest",

‎packages/plugins/tanstack-query/tests/plugin.test.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/// <reference types="@types/jest" />
22

3-
import { loadSchema } from '@zenstackhq/testtools';
3+
import { loadSchema, normalizePath } from '@zenstackhq/testtools';
44
import path from 'path';
55

66
describe('Tanstack Query Plugin Tests', () => {
@@ -50,7 +50,7 @@ model Foo {
5050
await loadSchema(
5151
`
5252
plugin tanstack {
53-
provider = '${path.resolve(__dirname, '../dist')}'
53+
provider = '${normalizePath(path.resolve(__dirname, '../dist'))}'
5454
output = '$projectRoot/hooks'
5555
target = 'react'
5656
}
@@ -71,7 +71,7 @@ ${sharedModel}
7171
await loadSchema(
7272
`
7373
plugin tanstack {
74-
provider = '${path.resolve(__dirname, '../dist')}'
74+
provider = '${normalizePath(path.resolve(__dirname, '../dist'))}'
7575
output = '$projectRoot/hooks'
7676
target = 'react'
7777
version = 'v5'
@@ -93,7 +93,7 @@ ${sharedModel}
9393
await loadSchema(
9494
`
9595
plugin tanstack {
96-
provider = '${path.resolve(__dirname, '../dist')}'
96+
provider = '${normalizePath(path.resolve(__dirname, '../dist'))}'
9797
output = '$projectRoot/hooks'
9898
target = 'vue'
9999
}
@@ -114,7 +114,7 @@ ${sharedModel}
114114
await loadSchema(
115115
`
116116
plugin tanstack {
117-
provider = '${path.resolve(__dirname, '../dist')}'
117+
provider = '${normalizePath(path.resolve(__dirname, '../dist'))}'
118118
output = '$projectRoot/hooks'
119119
target = 'vue'
120120
version = 'v5'
@@ -136,7 +136,7 @@ ${sharedModel}
136136
await loadSchema(
137137
`
138138
plugin tanstack {
139-
provider = '${path.resolve(__dirname, '../dist')}'
139+
provider = '${normalizePath(path.resolve(__dirname, '../dist'))}'
140140
output = '$projectRoot/hooks'
141141
target = 'svelte'
142142
}
@@ -157,7 +157,7 @@ ${sharedModel}
157157
await loadSchema(
158158
`
159159
plugin tanstack {
160-
provider = '${path.resolve(__dirname, '../dist')}'
160+
provider = '${normalizePath(path.resolve(__dirname, '../dist'))}'
161161
output = '$projectRoot/hooks'
162162
target = 'svelte'
163163
version = 'v5'

‎packages/plugins/trpc/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
},
1111
"scripts": {
1212
"clean": "rimraf dist",
13-
"build": "pnpm lint --max-warnings=0 && pnpm clean && tsc && copyfiles ./package.json ./README.md ./LICENSE 'res/**/*' dist && pnpm pack dist --pack-destination '../../../../.build'",
13+
"build": "pnpm lint --max-warnings=0 && pnpm clean && tsc && copyfiles ./package.json ./README.md ./LICENSE 'res/**/*' dist && pnpm pack dist --pack-destination ../../../../.build",
1414
"watch": "tsc --watch",
1515
"lint": "eslint src --ext ts",
1616
"test": "jest",

0 commit comments

Comments
 (0)