@@ -15,21 +15,20 @@ describe('0http Web Framework - Nested Routers', () => {
1515 req . body = req . url
1616 next ( )
1717 } )
18-
19- const router2 = require ( '../lib/router/sequential' ) ( )
20- router2 . get ( '/url' , ( req , res , next ) => {
21- req . body = req . url
22- next ( )
23- } )
24- router . use ( '/r2' , router2 )
2518 router . use ( '/r1' , router1 )
26-
27- router . use ( '/*' , ( req , res , next ) => {
19+ router . use ( '/r1' , ( req , res , next ) => {
2820 res . end ( req . url + ':' + req . body )
2921
3022 next ( )
3123 } )
3224
25+ const router2 = require ( '../lib/router/sequential' ) ( )
26+ router2 . get ( '/url/:age' , ( req , res , next ) => {
27+ req . params . age = ~ ~ req . params . age
28+ res . end ( JSON . stringify ( req . params ) )
29+ } )
30+ router . use ( '/r2/:name' , router2 )
31+
3332 server . listen ( ~ ~ process . env . PORT , err => {
3433 if ( ! err ) done ( )
3534 } )
@@ -44,19 +43,24 @@ describe('0http Web Framework - Nested Routers', () => {
4443 . expect ( 404 )
4544 } )
4645
47- it ( 'should hit GET /url on nested routers ' , async ( ) => {
46+ it ( 'should hit GET /url on nested router /r1 ' , async ( ) => {
4847 await request ( baseUrl )
4948 . get ( '/r1/url' )
5049 . expect ( 200 )
5150 . then ( ( response ) => {
5251 expect ( response . text ) . to . equal ( '/r1/url:/url' )
5352 } )
53+ } )
5454
55+ it ( 'should hit GET /url/:age on nested router /r2/:name' , async ( ) => {
5556 await request ( baseUrl )
56- . get ( '/r2/url?var=value' )
57+ . get ( '/r2/rolando/ url/33 ?var=value' )
5758 . expect ( 200 )
5859 . then ( ( response ) => {
59- expect ( response . text ) . to . equal ( '/r2/url?var=value:/url?var=value' )
60+ expect ( JSON . parse ( response . text ) ) . to . deep . include ( {
61+ name : 'rolando' ,
62+ age : 33
63+ } )
6064 } )
6165 } )
6266
0 commit comments