verdnatura-mirror
/
loopback
mirror of https://github.com/strongloop/loopback.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release/2.0.2' into production

This commit is contained in:
Raymond Feng 2014-07-27 00:44:31 -07:00
parent 0e3187c736 d638b29f55
commit 2d17dba1b2
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/registry.js
View File

@ -243,7 +243,7 @@ registry.createDataSource = function (name, options) {
var BaseModel = settings.base || settings.super; var BaseModel = settings.base || settings.super;
if (!BaseModel) { if (!BaseModel) {
// Check the connector types // Check the connector types
var connectorTypes = ds.connector && ds.connector.getTypes(); var connectorTypes = ds.getTypes();
if (Array.isArray(connectorTypes) && connectorTypes.indexOf('db') !== -1) { if (Array.isArray(connectorTypes) && connectorTypes.indexOf('db') !== -1) {
// Only set up the base model to PersistedModel if the connector is DB // Only set up the base model to PersistedModel if the connector is DB
BaseModel = self.PersistedModel; BaseModel = self.PersistedModel;

2
test/app.test.js
View File

@ -177,7 +177,7 @@ describe('app', function() {
it('starts http server', function(done) { it('starts http server', function(done) {
var app = loopback(); var app = loopback();
app.set('port', 0); app.set('port', 0);
app.get('/', function(req, res) { res.send(200, 'OK'); }); app.get('/', function(req, res) { res.status(200).send('OK'); });
var server = app.listen(); var server = app.listen();