Skip to content

Commit ea6a7f3

Browse files
thetutlagethetutlage
committed
test: fix routes scanner tests from failing
1 parent e1e9245 commit ea6a7f3

File tree

3 files changed

+40
-42
lines changed

3 files changed

+40
-42
lines changed

‎src/dev_server.ts‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -540,11 +540,6 @@ export class DevServer {
540540
debug('received hot-hook message %O', message)
541541
const absolutePath = message.path ? string.toUnixSlash(message.path) : ''
542542
const relativePath = relative(this.#cwdPath, absolutePath)
543-
console.log({
544-
relativePath,
545-
cwd: this.#cwdPath,
546-
absolutePath,
547-
})
548543

549544
if (message.type === 'hot-hook:file-changed') {
550545
const { action } = message

‎tests/code_scanners/routes_scanner.spec.ts‎

Lines changed: 39 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,8 @@ test.group('Routes scanner', () => {
6868
`
6969
)
7070

71-
const scanner = new RoutesScanner(string.toUnixSlash(fs.basePath), [])
71+
const source = string.toUnixSlash(fs.basePath)
72+
const scanner = new RoutesScanner(source, [])
7273
scanner.pathsResolver.use((specifier) => {
7374
const [namespace, ...rest] = specifier.split('/')
7475
const fileName = rest.pop()
@@ -130,7 +131,7 @@ test.group('Routes scanner', () => {
130131
])
131132

132133
assert.deepEqual(scanner.getControllers(), [
133-
join(fs.basePath, 'app/controllers/users_controller.ts'),
134+
join(source, 'app/controllers/users_controller.ts'),
134135
])
135136
assert.snapshot(scanner.getScannedRoutes()).matchInline(`
136137
[
@@ -143,7 +144,7 @@ test.group('Routes scanner', () => {
143144
},
144145
"method": "index",
145146
"name": "UsersController",
146-
"path": "${join(fs.basePath, '/app/controllers/users_controller.ts')}",
147+
"path": "${join(source, '/app/controllers/users_controller.ts')}",
147148
},
148149
"domain": "root",
149150
"methods": [
@@ -169,7 +170,7 @@ test.group('Routes scanner', () => {
169170
},
170171
"method": "create",
171172
"name": "UsersController",
172-
"path": "${join(fs.basePath, '/app/controllers/users_controller.ts')}",
173+
"path": "${join(source, '/app/controllers/users_controller.ts')}",
173174
},
174175
"domain": "root",
175176
"methods": [
@@ -195,7 +196,7 @@ test.group('Routes scanner', () => {
195196
},
196197
"method": "store",
197198
"name": "UsersController",
198-
"path": "${join(fs.basePath, '/app/controllers/users_controller.ts')}",
199+
"path": "${join(source, '/app/controllers/users_controller.ts')}",
199200
},
200201
"domain": "root",
201202
"methods": [
@@ -234,7 +235,7 @@ test.group('Routes scanner', () => {
234235
},
235236
"method": "edit",
236237
"name": "UsersController",
237-
"path": "${join(fs.basePath, '/app/controllers/users_controller.ts')}",
238+
"path": "${join(source, '/app/controllers/users_controller.ts')}",
238239
},
239240
"domain": "root",
240241
"methods": [
@@ -260,7 +261,7 @@ test.group('Routes scanner', () => {
260261
},
261262
"method": "update",
262263
"name": "UsersController",
263-
"path": "${join(fs.basePath, '/app/controllers/users_controller.ts')}",
264+
"path": "${join(source, '/app/controllers/users_controller.ts')}",
264265
},
265266
"domain": "root",
266267
"methods": [
@@ -349,7 +350,8 @@ test.group('Routes scanner', () => {
349350
`
350351
)
351352

352-
const scanner = new RoutesScanner(string.toUnixSlash(fs.basePath), [])
353+
const source = string.toUnixSlash(fs.basePath)
354+
const scanner = new RoutesScanner(source, [])
353355
scanner.defineRequest((route) => {
354356
if (route.name === 'users.store') {
355357
return {
@@ -429,7 +431,7 @@ test.group('Routes scanner', () => {
429431
])
430432

431433
assert.deepEqual(scanner.getControllers(), [
432-
join(fs.basePath, 'app/controllers/users_controller.ts'),
434+
join(source, 'app/controllers/users_controller.ts'),
433435
])
434436
assert.snapshot(scanner.getScannedRoutes()).matchInline(`
435437
[
@@ -442,7 +444,7 @@ test.group('Routes scanner', () => {
442444
},
443445
"method": "index",
444446
"name": "UsersController",
445-
"path": "${join(fs.basePath, '/app/controllers/users_controller.ts')}",
447+
"path": "${join(source, '/app/controllers/users_controller.ts')}",
446448
},
447449
"domain": "root",
448450
"methods": [
@@ -468,7 +470,7 @@ test.group('Routes scanner', () => {
468470
},
469471
"method": "create",
470472
"name": "UsersController",
471-
"path": "${join(fs.basePath, '/app/controllers/users_controller.ts')}",
473+
"path": "${join(source, '/app/controllers/users_controller.ts')}",
472474
},
473475
"domain": "root",
474476
"methods": [
@@ -494,7 +496,7 @@ test.group('Routes scanner', () => {
494496
},
495497
"method": "store",
496498
"name": "UsersController",
497-
"path": "${join(fs.basePath, '/app/controllers/users_controller.ts')}",
499+
"path": "${join(source, '/app/controllers/users_controller.ts')}",
498500
},
499501
"domain": "root",
500502
"methods": [
@@ -535,7 +537,7 @@ test.group('Routes scanner', () => {
535537
},
536538
"method": "edit",
537539
"name": "UsersController",
538-
"path": "${join(fs.basePath, '/app/controllers/users_controller.ts')}",
540+
"path": "${join(source, '/app/controllers/users_controller.ts')}",
539541
},
540542
"domain": "root",
541543
"methods": [
@@ -561,7 +563,7 @@ test.group('Routes scanner', () => {
561563
},
562564
"method": "update",
563565
"name": "UsersController",
564-
"path": "${join(fs.basePath, '/app/controllers/users_controller.ts')}",
566+
"path": "${join(source, '/app/controllers/users_controller.ts')}",
565567
},
566568
"domain": "root",
567569
"methods": [
@@ -650,7 +652,8 @@ test.group('Routes scanner', () => {
650652
`
651653
)
652654

653-
const scanner = new RoutesScanner(string.toUnixSlash(fs.basePath), [])
655+
const source = string.toUnixSlash(fs.basePath)
656+
const scanner = new RoutesScanner(source, [])
654657
scanner.pathsResolver.use((specifier) => {
655658
const [namespace, ...rest] = specifier.split('/')
656659
const fileName = rest.pop()
@@ -722,7 +725,7 @@ test.group('Routes scanner', () => {
722725
},
723726
"method": "index",
724727
"name": "UsersController",
725-
"path": "${join(fs.basePath, '/app/controllers/users_controller.ts')}",
728+
"path": "${join(source, '/app/controllers/users_controller.ts')}",
726729
},
727730
"domain": "root",
728731
"methods": [
@@ -748,7 +751,7 @@ test.group('Routes scanner', () => {
748751
},
749752
"method": "create",
750753
"name": "UsersController",
751-
"path": "${join(fs.basePath, '/app/controllers/users_controller.ts')}",
754+
"path": "${join(source, '/app/controllers/users_controller.ts')}",
752755
},
753756
"domain": "root",
754757
"methods": [
@@ -774,7 +777,7 @@ test.group('Routes scanner', () => {
774777
},
775778
"method": "store",
776779
"name": "UsersController",
777-
"path": "${join(fs.basePath, '/app/controllers/users_controller.ts')}",
780+
"path": "${join(source, '/app/controllers/users_controller.ts')}",
778781
},
779782
"domain": "root",
780783
"methods": [
@@ -813,7 +816,7 @@ test.group('Routes scanner', () => {
813816
},
814817
"method": "edit",
815818
"name": "UsersController",
816-
"path": "${join(fs.basePath, '/app/controllers/users_controller.ts')}",
819+
"path": "${join(source, '/app/controllers/users_controller.ts')}",
817820
},
818821
"domain": "root",
819822
"methods": [
@@ -839,7 +842,7 @@ test.group('Routes scanner', () => {
839842
},
840843
"method": "update",
841844
"name": "UsersController",
842-
"path": "${join(fs.basePath, '/app/controllers/users_controller.ts')}",
845+
"path": "${join(source, '/app/controllers/users_controller.ts')}",
843846
},
844847
"domain": "root",
845848
"methods": [
@@ -932,7 +935,8 @@ test.group('Routes scanner', () => {
932935
`
933936
)
934937

935-
const scanner = new RoutesScanner(string.toUnixSlash(fs.basePath), [])
938+
const source = string.toUnixSlash(fs.basePath)
939+
const scanner = new RoutesScanner(source, [])
936940
scanner.pathsResolver.use((specifier) => {
937941
const [namespace, ...rest] = specifier.split('/')
938942
const fileName = rest.pop()
@@ -994,7 +998,7 @@ test.group('Routes scanner', () => {
994998
},
995999
"method": "index",
9961000
"name": "UsersController",
997-
"path": "${join(fs.basePath, '/app/controllers/users_controller.ts')}",
1001+
"path": "${join(source, '/app/controllers/users_controller.ts')}",
9981002
},
9991003
"domain": "root",
10001004
"methods": [
@@ -1020,7 +1024,7 @@ test.group('Routes scanner', () => {
10201024
},
10211025
"method": "store",
10221026
"name": "UsersController",
1023-
"path": "${join(fs.basePath, '/app/controllers/users_controller.ts')}",
1027+
"path": "${join(source, '/app/controllers/users_controller.ts')}",
10241028
},
10251029
"domain": "root",
10261030
"methods": [
@@ -1059,7 +1063,7 @@ test.group('Routes scanner', () => {
10591063
},
10601064
"method": "index",
10611065
"name": "PostsController",
1062-
"path": "${join(fs.basePath, '/app/controllers/posts_controller.ts')}",
1066+
"path": "${join(source, '/app/controllers/posts_controller.ts')}",
10631067
},
10641068
"domain": "root",
10651069
"methods": [
@@ -1085,7 +1089,7 @@ test.group('Routes scanner', () => {
10851089
},
10861090
"method": "store",
10871091
"name": "PostsController",
1088-
"path": "${join(fs.basePath, '/app/controllers/posts_controller.ts')}",
1092+
"path": "${join(source, '/app/controllers/posts_controller.ts')}",
10891093
},
10901094
"domain": "root",
10911095
"methods": [
@@ -1162,7 +1166,7 @@ test.group('Routes scanner', () => {
11621166
`
11631167
)
11641168

1165-
await scanner.invalidate(join(fs.basePath, 'app/controllers/users_controller.ts'))
1169+
await scanner.invalidate(join(source, 'app/controllers/users_controller.ts'))
11661170
assert.snapshot(scanner.getScannedRoutes()).matchInline(`
11671171
[
11681172
{
@@ -1174,7 +1178,7 @@ test.group('Routes scanner', () => {
11741178
},
11751179
"method": "index",
11761180
"name": "UsersController",
1177-
"path": "${join(fs.basePath, '/app/controllers/users_controller.ts')}",
1181+
"path": "${join(source, '/app/controllers/users_controller.ts')}",
11781182
},
11791183
"domain": "root",
11801184
"methods": [
@@ -1200,7 +1204,7 @@ test.group('Routes scanner', () => {
12001204
},
12011205
"method": "store",
12021206
"name": "UsersController",
1203-
"path": "${join(fs.basePath, '/app/controllers/users_controller.ts')}",
1207+
"path": "${join(source, '/app/controllers/users_controller.ts')}",
12041208
},
12051209
"domain": "root",
12061210
"methods": [
@@ -1239,7 +1243,7 @@ test.group('Routes scanner', () => {
12391243
},
12401244
"method": "index",
12411245
"name": "PostsController",
1242-
"path": "${join(fs.basePath, '/app/controllers/posts_controller.ts')}",
1246+
"path": "${join(source, '/app/controllers/posts_controller.ts')}",
12431247
},
12441248
"domain": "root",
12451249
"methods": [
@@ -1265,7 +1269,7 @@ test.group('Routes scanner', () => {
12651269
},
12661270
"method": "store",
12671271
"name": "PostsController",
1268-
"path": "${join(fs.basePath, '/app/controllers/posts_controller.ts')}",
1272+
"path": "${join(source, '/app/controllers/posts_controller.ts')}",
12691273
},
12701274
"domain": "root",
12711275
"methods": [
@@ -1298,7 +1302,7 @@ test.group('Routes scanner', () => {
12981302
]
12991303
`)
13001304

1301-
await scanner.invalidate(join(fs.basePath, 'app/controllers/posts_controller.ts'))
1305+
await scanner.invalidate(join(source, 'app/controllers/posts_controller.ts'))
13021306
assert.snapshot(scanner.getScannedRoutes()).matchInline(`
13031307
[
13041308
{
@@ -1310,7 +1314,7 @@ test.group('Routes scanner', () => {
13101314
},
13111315
"method": "index",
13121316
"name": "UsersController",
1313-
"path": "${join(fs.basePath, '/app/controllers/users_controller.ts')}",
1317+
"path": "${join(source, '/app/controllers/users_controller.ts')}",
13141318
},
13151319
"domain": "root",
13161320
"methods": [
@@ -1336,7 +1340,7 @@ test.group('Routes scanner', () => {
13361340
},
13371341
"method": "store",
13381342
"name": "UsersController",
1339-
"path": "${join(fs.basePath, '/app/controllers/users_controller.ts')}",
1343+
"path": "${join(source, '/app/controllers/users_controller.ts')}",
13401344
},
13411345
"domain": "root",
13421346
"methods": [
@@ -1375,7 +1379,7 @@ test.group('Routes scanner', () => {
13751379
},
13761380
"method": "index",
13771381
"name": "PostsController",
1378-
"path": "${join(fs.basePath, '/app/controllers/posts_controller.ts')}",
1382+
"path": "${join(source, '/app/controllers/posts_controller.ts')}",
13791383
},
13801384
"domain": "root",
13811385
"methods": [
@@ -1401,7 +1405,7 @@ test.group('Routes scanner', () => {
14011405
},
14021406
"method": "store",
14031407
"name": "PostsController",
1404-
"path": "${join(fs.basePath, '/app/controllers/posts_controller.ts')}",
1408+
"path": "${join(source, '/app/controllers/posts_controller.ts')}",
14051409
},
14061410
"domain": "root",
14071411
"methods": [

‎tests/dev_server.spec.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,6 @@ test.group('DevServer', () => {
279279
await devServer.close()
280280

281281
const logMessages = devServer.ui.logger.getLogs().map(({ message }) => message)
282-
console.log(logMessages)
283282
assert.isAtLeast(
284283
logMessages.filter((message) => message.includes('green(update) start/routes.ts')).length,
285284
1
@@ -311,7 +310,6 @@ test.group('DevServer', () => {
311310
await devServer.close()
312311

313312
const logMessages = devServer.ui.logger.getLogs().map(({ message }) => message)
314-
console.log(logMessages)
315313
assert.isAtLeast(
316314
logMessages.filter((message) => message.includes('green(invalidated) start/routes.ts'))
317315
.length,
@@ -528,6 +526,7 @@ test.group('DevServer', () => {
528526
await sleep(1000)
529527
const logs = devServer.ui.logger.getLogs()
530528

529+
console.log(logs)
531530
const indexGenerationLogs = logs.filter(({ message }) =>
532531
message.includes('.adonisjs/server/controllers.ts')
533532
)

0 commit comments

Comments
 (0)