Skip to content

Commit 9734322

Browse files
thetutlagethetutlage
committed
test: normalize paths to be unix paths in all places
1 parent adfbdc0 commit 9734322

File tree

2 files changed

+32
-28
lines changed

2 files changed

+32
-28
lines changed

‎src/code_scanners/routes_scanner/validator_extractor.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import {
2222
inspectMethodArguments,
2323
searchValidatorDirectUsage,
2424
} from '../../helpers.ts'
25+
import string from '@poppinss/utils/string'
2526

2627
/**
2728
* Extracts the VineJS validator usage from within a controller
@@ -132,7 +133,9 @@ export async function extractValidators(
132133
name: validationCall,
133134
import: {
134135
specifier: isRelative(importCall.specifier)
135-
? relative(appRoot, fileURLToPath(new URL(importCall.specifier, controllerURL)))
136+
? string.toUnixSlash(
137+
relative(appRoot, fileURLToPath(new URL(importCall.specifier, controllerURL)))
138+
)
136139
: importCall.specifier,
137140
type: importCall.clause.type,
138141
value: importCall.clause.value,

‎tests/code_scanners/routes_scanner.spec.ts

Lines changed: 28 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
import { join } from 'node:path'
1111
import { test } from '@japa/runner'
12+
import string from '@poppinss/utils/string'
1213
import { RoutesScanner } from '../../src/code_scanners/routes_scanner/main.ts'
1314

1415
test.group('Routes scanner', () => {
@@ -139,7 +140,7 @@ test.group('Routes scanner', () => {
139140
},
140141
"method": "index",
141142
"name": "UsersController",
142-
"path": "${join(fs.basePath, '/app/controllers/users_controller.ts')}",
143+
"path": "${string.toUnixSlash(join(fs.basePath, '/app/controllers/users_controller.ts'))}",
143144
},
144145
"domain": "root",
145146
"methods": [
@@ -165,7 +166,7 @@ test.group('Routes scanner', () => {
165166
},
166167
"method": "create",
167168
"name": "UsersController",
168-
"path": "${join(fs.basePath, '/app/controllers/users_controller.ts')}",
169+
"path": "${string.toUnixSlash(join(fs.basePath, '/app/controllers/users_controller.ts'))}",
169170
},
170171
"domain": "root",
171172
"methods": [
@@ -191,7 +192,7 @@ test.group('Routes scanner', () => {
191192
},
192193
"method": "store",
193194
"name": "UsersController",
194-
"path": "${join(fs.basePath, '/app/controllers/users_controller.ts')}",
195+
"path": "${string.toUnixSlash(join(fs.basePath, '/app/controllers/users_controller.ts'))}",
195196
},
196197
"domain": "root",
197198
"methods": [
@@ -230,7 +231,7 @@ test.group('Routes scanner', () => {
230231
},
231232
"method": "edit",
232233
"name": "UsersController",
233-
"path": "${join(fs.basePath, '/app/controllers/users_controller.ts')}",
234+
"path": "${string.toUnixSlash(join(fs.basePath, '/app/controllers/users_controller.ts'))}",
234235
},
235236
"domain": "root",
236237
"methods": [
@@ -256,7 +257,7 @@ test.group('Routes scanner', () => {
256257
},
257258
"method": "update",
258259
"name": "UsersController",
259-
"path": "${join(fs.basePath, '/app/controllers/users_controller.ts')}",
260+
"path": "${string.toUnixSlash(join(fs.basePath, '/app/controllers/users_controller.ts'))}",
260261
},
261262
"domain": "root",
262263
"methods": [
@@ -435,7 +436,7 @@ test.group('Routes scanner', () => {
435436
},
436437
"method": "index",
437438
"name": "UsersController",
438-
"path": "${join(fs.basePath, '/app/controllers/users_controller.ts')}",
439+
"path": "${string.toUnixSlash(join(fs.basePath, '/app/controllers/users_controller.ts'))}",
439440
},
440441
"domain": "root",
441442
"methods": [
@@ -461,7 +462,7 @@ test.group('Routes scanner', () => {
461462
},
462463
"method": "create",
463464
"name": "UsersController",
464-
"path": "${join(fs.basePath, '/app/controllers/users_controller.ts')}",
465+
"path": "${string.toUnixSlash(join(fs.basePath, '/app/controllers/users_controller.ts'))}",
465466
},
466467
"domain": "root",
467468
"methods": [
@@ -487,7 +488,7 @@ test.group('Routes scanner', () => {
487488
},
488489
"method": "store",
489490
"name": "UsersController",
490-
"path": "${join(fs.basePath, '/app/controllers/users_controller.ts')}",
491+
"path": "${string.toUnixSlash(join(fs.basePath, '/app/controllers/users_controller.ts'))}",
491492
},
492493
"domain": "root",
493494
"methods": [
@@ -528,7 +529,7 @@ test.group('Routes scanner', () => {
528529
},
529530
"method": "edit",
530531
"name": "UsersController",
531-
"path": "${join(fs.basePath, '/app/controllers/users_controller.ts')}",
532+
"path": "${string.toUnixSlash(join(fs.basePath, '/app/controllers/users_controller.ts'))}",
532533
},
533534
"domain": "root",
534535
"methods": [
@@ -554,7 +555,7 @@ test.group('Routes scanner', () => {
554555
},
555556
"method": "update",
556557
"name": "UsersController",
557-
"path": "${join(fs.basePath, '/app/controllers/users_controller.ts')}",
558+
"path": "${string.toUnixSlash(join(fs.basePath, '/app/controllers/users_controller.ts'))}",
558559
},
559560
"domain": "root",
560561
"methods": [
@@ -715,7 +716,7 @@ test.group('Routes scanner', () => {
715716
},
716717
"method": "index",
717718
"name": "UsersController",
718-
"path": "${join(fs.basePath, '/app/controllers/users_controller.ts')}",
719+
"path": "${string.toUnixSlash(join(fs.basePath, '/app/controllers/users_controller.ts'))}",
719720
},
720721
"domain": "root",
721722
"methods": [
@@ -741,7 +742,7 @@ test.group('Routes scanner', () => {
741742
},
742743
"method": "create",
743744
"name": "UsersController",
744-
"path": "${join(fs.basePath, '/app/controllers/users_controller.ts')}",
745+
"path": "${string.toUnixSlash(join(fs.basePath, '/app/controllers/users_controller.ts'))}",
745746
},
746747
"domain": "root",
747748
"methods": [
@@ -767,7 +768,7 @@ test.group('Routes scanner', () => {
767768
},
768769
"method": "store",
769770
"name": "UsersController",
770-
"path": "${join(fs.basePath, '/app/controllers/users_controller.ts')}",
771+
"path": "${string.toUnixSlash(join(fs.basePath, '/app/controllers/users_controller.ts'))}",
771772
},
772773
"domain": "root",
773774
"methods": [
@@ -806,7 +807,7 @@ test.group('Routes scanner', () => {
806807
},
807808
"method": "edit",
808809
"name": "UsersController",
809-
"path": "${join(fs.basePath, '/app/controllers/users_controller.ts')}",
810+
"path": "${string.toUnixSlash(join(fs.basePath, '/app/controllers/users_controller.ts'))}",
810811
},
811812
"domain": "root",
812813
"methods": [
@@ -832,7 +833,7 @@ test.group('Routes scanner', () => {
832833
},
833834
"method": "update",
834835
"name": "UsersController",
835-
"path": "${join(fs.basePath, '/app/controllers/users_controller.ts')}",
836+
"path": "${string.toUnixSlash(join(fs.basePath, '/app/controllers/users_controller.ts'))}",
836837
},
837838
"domain": "root",
838839
"methods": [
@@ -987,7 +988,7 @@ test.group('Routes scanner', () => {
987988
},
988989
"method": "index",
989990
"name": "UsersController",
990-
"path": "${join(fs.basePath, '/app/controllers/users_controller.ts')}",
991+
"path": "${string.toUnixSlash(join(fs.basePath, '/app/controllers/users_controller.ts'))}",
991992
},
992993
"domain": "root",
993994
"methods": [
@@ -1013,7 +1014,7 @@ test.group('Routes scanner', () => {
10131014
},
10141015
"method": "store",
10151016
"name": "UsersController",
1016-
"path": "${join(fs.basePath, '/app/controllers/users_controller.ts')}",
1017+
"path": "${string.toUnixSlash(join(fs.basePath, '/app/controllers/users_controller.ts'))}",
10171018
},
10181019
"domain": "root",
10191020
"methods": [
@@ -1052,7 +1053,7 @@ test.group('Routes scanner', () => {
10521053
},
10531054
"method": "index",
10541055
"name": "PostsController",
1055-
"path": "${join(fs.basePath, '/app/controllers/posts_controller.ts')}",
1056+
"path": "${string.toUnixSlash(join(fs.basePath, '/app/controllers/posts_controller.ts'))}",
10561057
},
10571058
"domain": "root",
10581059
"methods": [
@@ -1078,7 +1079,7 @@ test.group('Routes scanner', () => {
10781079
},
10791080
"method": "store",
10801081
"name": "PostsController",
1081-
"path": "${join(fs.basePath, '/app/controllers/posts_controller.ts')}",
1082+
"path": "${string.toUnixSlash(join(fs.basePath, '/app/controllers/posts_controller.ts'))}",
10821083
},
10831084
"domain": "root",
10841085
"methods": [
@@ -1167,7 +1168,7 @@ test.group('Routes scanner', () => {
11671168
},
11681169
"method": "index",
11691170
"name": "UsersController",
1170-
"path": "${join(fs.basePath, '/app/controllers/users_controller.ts')}",
1171+
"path": "${string.toUnixSlash(join(fs.basePath, '/app/controllers/users_controller.ts'))}",
11711172
},
11721173
"domain": "root",
11731174
"methods": [
@@ -1193,7 +1194,7 @@ test.group('Routes scanner', () => {
11931194
},
11941195
"method": "store",
11951196
"name": "UsersController",
1196-
"path": "${join(fs.basePath, '/app/controllers/users_controller.ts')}",
1197+
"path": "${string.toUnixSlash(join(fs.basePath, '/app/controllers/users_controller.ts'))}",
11971198
},
11981199
"domain": "root",
11991200
"methods": [
@@ -1232,7 +1233,7 @@ test.group('Routes scanner', () => {
12321233
},
12331234
"method": "index",
12341235
"name": "PostsController",
1235-
"path": "${join(fs.basePath, '/app/controllers/posts_controller.ts')}",
1236+
"path": "${string.toUnixSlash(join(fs.basePath, '/app/controllers/posts_controller.ts'))}",
12361237
},
12371238
"domain": "root",
12381239
"methods": [
@@ -1258,7 +1259,7 @@ test.group('Routes scanner', () => {
12581259
},
12591260
"method": "store",
12601261
"name": "PostsController",
1261-
"path": "${join(fs.basePath, '/app/controllers/posts_controller.ts')}",
1262+
"path": "${string.toUnixSlash(join(fs.basePath, '/app/controllers/posts_controller.ts'))}",
12621263
},
12631264
"domain": "root",
12641265
"methods": [
@@ -1303,7 +1304,7 @@ test.group('Routes scanner', () => {
13031304
},
13041305
"method": "index",
13051306
"name": "UsersController",
1306-
"path": "${join(fs.basePath, '/app/controllers/users_controller.ts')}",
1307+
"path": "${string.toUnixSlash(join(fs.basePath, '/app/controllers/users_controller.ts'))}",
13071308
},
13081309
"domain": "root",
13091310
"methods": [
@@ -1329,7 +1330,7 @@ test.group('Routes scanner', () => {
13291330
},
13301331
"method": "store",
13311332
"name": "UsersController",
1332-
"path": "${join(fs.basePath, '/app/controllers/users_controller.ts')}",
1333+
"path": "${string.toUnixSlash(join(fs.basePath, '/app/controllers/users_controller.ts'))}",
13331334
},
13341335
"domain": "root",
13351336
"methods": [
@@ -1368,7 +1369,7 @@ test.group('Routes scanner', () => {
13681369
},
13691370
"method": "index",
13701371
"name": "PostsController",
1371-
"path": "${join(fs.basePath, '/app/controllers/posts_controller.ts')}",
1372+
"path": "${string.toUnixSlash(join(fs.basePath, '/app/controllers/posts_controller.ts'))}",
13721373
},
13731374
"domain": "root",
13741375
"methods": [
@@ -1394,7 +1395,7 @@ test.group('Routes scanner', () => {
13941395
},
13951396
"method": "store",
13961397
"name": "PostsController",
1397-
"path": "${join(fs.basePath, '/app/controllers/posts_controller.ts')}",
1398+
"path": "${string.toUnixSlash(join(fs.basePath, '/app/controllers/posts_controller.ts'))}",
13981399
},
13991400
"domain": "root",
14001401
"methods": [

0 commit comments

Comments
 (0)