Merge branch 'master' into 2.0

This commit is contained in:
Miroslav Bajtoš 2014-06-14 09:40:57 +02:00
commit d2517d8236
2 changed files with 7 additions and 0 deletions

View File

@ -55,6 +55,8 @@ function createApplication() {
merge(app, proto);
app.loopback = loopback;
// Create a new instance of models registry per each app instance
app.models = function() {
return proto.models.apply(this, arguments);

View File

@ -524,4 +524,9 @@ describe('app', function() {
expect(app2.get('key'), 'app2 value').to.equal(undefined);
});
});
it('exposes loopback as a property', function() {
var app = loopback();
expect(app.loopback).to.equal(loopback);
});
});