@@ -323,6 +323,7 @@ describe('ViewRenderer', () => {
323323 renderer . setEngine ( { engine : { ejs } , root : views } ) ;
324324
325325 await expect ( renderer . render ( 'users' ) ) . resolves . toBe ( 'users index' ) ;
326+ await expect ( renderer . render ( 'users/' ) ) . resolves . toBe ( 'users index' ) ;
326327 await expect ( renderer . render ( 'users.ejs' ) ) . resolves . toBe ( 'users index' ) ;
327328 } ) ;
328329
@@ -334,6 +335,46 @@ describe('ViewRenderer', () => {
334335 await expect ( renderer . render ( 'users' ) ) . resolves . toBe ( 'users file' ) ;
335336 } ) ;
336337
338+ it ( 'should resolve to the index file when trailing slash is used, even if a file shares the name' , async ( ) => {
339+ write ( 'views/a.ejs' , 'a file' ) ;
340+ write ( 'views/a/index.ejs' , 'a index' ) ;
341+ renderer . setEngine ( { engine : { ejs } , root : views } ) ;
342+
343+ await expect ( renderer . render ( 'a' ) ) . resolves . toBe ( 'a file' ) ;
344+ await expect ( renderer . render ( 'a/' ) ) . resolves . toBe ( 'a index' ) ;
345+ } ) ;
346+
347+ it ( 'should not fall back to a view file when trailing slash names a missing index file' , async ( ) => {
348+ write ( 'views/a.ejs' , 'a file' ) ;
349+ renderer . setEngine ( { engine : { ejs } , root : views } ) ;
350+
351+ await expect ( renderer . render ( 'a' ) ) . resolves . toBe ( 'a file' ) ;
352+ await expect ( renderer . render ( 'a/' ) ) . rejects . toThrow (
353+ 'Failed to lookup view' ,
354+ ) ;
355+ } ) ;
356+
357+ it ( 'should resolve a view named with its extension and a trailing slash, as Express does' , async ( ) => {
358+ write ( 'views/a.ejs' , 'a file' ) ;
359+ write ( 'views/users/index.ejs' , 'users index' ) ;
360+ renderer . setEngine ( { engine : { ejs } , root : views } ) ;
361+
362+ await expect ( renderer . render ( 'a.ejs/' ) ) . resolves . toBe ( 'a file' ) ;
363+ await expect ( renderer . render ( 'users.ejs/' ) ) . resolves . toBe ( 'users index' ) ;
364+ } ) ;
365+
366+ it ( 'should not resolve "/" to ".<ext>" at the views root' , async ( ) => {
367+ write ( 'views/.ejs' , 'root dot ejs' ) ;
368+ renderer . setEngine ( { engine : { ejs } , root : views } ) ;
369+
370+ await expect ( renderer . render ( '/' ) ) . rejects . toThrow (
371+ 'Failed to lookup view' ,
372+ ) ;
373+ await expect ( renderer . render ( '\\' ) ) . rejects . toThrow (
374+ 'Failed to lookup view' ,
375+ ) ;
376+ } ) ;
377+
337378 it ( 'should not take a directory named like the view file for it' , async ( ) => {
338379 mkdirSync ( join ( views , 'users.ejs' ) ) ;
339380 write ( 'views/users/index.ejs' , 'users index' ) ;
0 commit comments