Merge branch 'master' into 2.0
This commit is contained in:
commit
d2517d8236
|
@ -55,6 +55,8 @@ function createApplication() {
|
||||||
|
|
||||||
merge(app, proto);
|
merge(app, proto);
|
||||||
|
|
||||||
|
app.loopback = loopback;
|
||||||
|
|
||||||
// Create a new instance of models registry per each app instance
|
// Create a new instance of models registry per each app instance
|
||||||
app.models = function() {
|
app.models = function() {
|
||||||
return proto.models.apply(this, arguments);
|
return proto.models.apply(this, arguments);
|
||||||
|
|
|
@ -524,4 +524,9 @@ describe('app', function() {
|
||||||
expect(app2.get('key'), 'app2 value').to.equal(undefined);
|
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);
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|
Loading…
Reference in New Issue