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

Merge pull request #6 from strongloop/swagger-testing 

Update the list of shared methods
This commit is contained in:
Raymond Feng 2013-08-18 09:57:40 -07:00
parent e6e2a62e46 534cc4af2f
commit c6b07700c3
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/models/model.js
View File

@ -48,7 +48,7 @@ Model.setup = function () {
} else if(data) {
fn(null, new ModelCtor(data));
} else if(id) {
ModelCtor.find(id, function (err, model) {
ModelCtor.findById(id, function (err, model) {
if(err) {
fn(err);
} else if(model) {
@ -96,14 +96,14 @@ Model.setup = function () {
});
}
}
// Map the prototype method to /:id with data in the body
ModelCtor.sharedCtor.accepts = [
{arg: 'data', type: 'object', http: {source: 'body'}},
{arg: 'id', type: 'any', http: {source: 'url'}}
{arg: 'id', type: 'any', http: {source: 'path'}}
// {arg: 'instance', type: 'object', http: {source: 'body'}}
];
ModelCtor.sharedCtor.http = [
{path: '/'},
{path: '/:id'}
];

11
test/data-source.test.js
View File

@ -44,8 +44,8 @@ describe('DataSource', function() {
// -
existsAndShared('_forDB', false);
existsAndShared('create', true);
existsAndShared('updateOrCreate', false);
existsAndShared('upsert', false);
existsAndShared('updateOrCreate', true);
existsAndShared('upsert', true);
existsAndShared('findOrCreate', false);
existsAndShared('exists', true);
existsAndShared('find', true);
@ -57,10 +57,11 @@ describe('DataSource', function() {
existsAndShared('hasMany', false);
existsAndShared('belongsTo', false);
existsAndShared('hasAndBelongsToMany', false);
existsAndShared('save', true);
existsAndShared('save', false);
existsAndShared('isNewRecord', false);
existsAndShared('_adapter', false);
existsAndShared('destroy', true);
existsAndShared('destroyById', true);
existsAndShared('destroy', false);
existsAndShared('updateAttributes', true);
existsAndShared('reload', true);
@ -70,4 +71,4 @@ describe('DataSource', function() {
}
});
});
});
});