Fix subapp.mountpath regression for app.use(subapp)

fixes #2233
This commit is contained in:
Douglas Christopher Wilson
2014-07-12 22:07:43 -04:00
parent 8ba3f39b33
commit 3e32721e24
3 changed files with 14 additions and 6 deletions

View File

@@ -1,3 +1,8 @@
unreleased
==========
* fix `subapp.mountpath` regression for `app.use(subapp)`
4.6.0 / 2014-07-11
==================

View File

@@ -168,7 +168,7 @@ app.use = function use(path, fn) {
// express app
if (mount_app && mount_app.handle && mount_app.set) {
debug('.use app under %s', mount_path);
mount_app.mountpath = path;
mount_app.mountpath = mount_path;
mount_app.parent = this;
// restore .app property on req and res

View File

@@ -39,16 +39,19 @@ describe('app.parent', function(){
describe('app.mountpath', function(){
it('should return the mounted path', function(){
var app = express()
, blog = express()
, blogAdmin = express();
var admin = express();
var app = express();
var blog = express();
var fallback = express();
app.use('/blog', blog);
blog.use('/admin', blogAdmin);
app.use(fallback);
blog.use('/admin', admin);
admin.mountpath.should.equal('/admin');
app.mountpath.should.equal('/');
blog.mountpath.should.equal('/blog');
blogAdmin.mountpath.should.equal('/admin');
fallback.mountpath.should.equal('/');
})
})