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

Merge branch 'master' into 2.0

This commit is contained in:
Raymond Feng 2014-06-20 23:48:46 -07:00
parent b44dac3c62 ebe65656e5
commit 9eab7d62d3
3 changed files with 26 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/models/model.js
View File

@ -340,7 +340,7 @@ Model.remoteMethod = function(name, options) {
Model.belongsToRemoting = function(relationName, relation, define) {
var fn = this.prototype[relationName];
define(relationName, {
define('__get__' + relationName, {
isStatic: false,
http: {verb: 'get', path: '/' + relationName},
accepts: {arg: 'refresh', type: 'boolean', http: {source: 'query'}},

3
lib/models/persisted-model.js
View File

@ -471,7 +471,8 @@ PersistedModel.setupRemoting = function() {
description: 'Find first instance of the model matched by filter from the data source',
accepts: {arg: 'filter', type: 'object', description: 'Filter defining fields, where, orderBy, offset, and limit'},
returns: {arg: 'data', type: typeName, root: true},
http: {verb: 'get', path: '/findOne'}
http: {verb: 'get', path: '/findOne'},
rest: {after: convertNullToNotFoundError}
});
setRemoting(PersistedModel, 'destroyAll', {

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

@ -23,7 +23,6 @@ describe('DataSource', function() {
assert.isFunc(Color, 'destroyAll');
assert.isFunc(Color, 'count');
assert.isFunc(Color, 'include');
assert.isFunc(Color, 'relationNameFor');
assert.isFunc(Color, 'hasMany');
assert.isFunc(Color, 'belongsTo');
assert.isFunc(Color, 'hasAndBelongsToMany');
@ -44,28 +43,29 @@ describe('DataSource', function() {
// assert the defaults
// - true: the method should be remote enabled
// - false: the method should not be remote enabled
// -
existsAndShared(TestModel, '_forDB', false);
existsAndShared(TestModel, 'create', true);
existsAndShared(TestModel, 'updateOrCreate', true);
existsAndShared(TestModel, 'upsert', true);
existsAndShared(TestModel, 'findOrCreate', false);
existsAndShared(TestModel, 'exists', true);
existsAndShared(TestModel, 'find', true);
existsAndShared(TestModel, 'findOne', true);
existsAndShared(TestModel, 'destroyAll', false);
existsAndShared(TestModel, 'count', true);
existsAndShared(TestModel, 'include', false);
existsAndShared(TestModel, 'relationNameFor', false);
existsAndShared(TestModel, 'hasMany', false);
existsAndShared(TestModel, 'belongsTo', false);
existsAndShared(TestModel, 'hasAndBelongsToMany', false);
// existsAndShared(TestModel.prototype, 'updateAttributes', true);
existsAndShared(TestModel, 'save', false, true);
existsAndShared(TestModel, 'isNewRecord', false, true);
existsAndShared(TestModel, '_adapter', false, true);
existsAndShared(TestModel, 'destroy', false, true);
existsAndShared(TestModel, 'reload', false, true);
// -
existsAndShared('_forDB', false);
existsAndShared('create', true);
existsAndShared('updateOrCreate', true);
existsAndShared('upsert', true);
existsAndShared('findOrCreate', false);
existsAndShared('exists', true);
existsAndShared('find', true);
existsAndShared('findOne', true);
existsAndShared('destroyAll', false);
existsAndShared('count', true);
existsAndShared('include', false);
existsAndShared('hasMany', false);
existsAndShared('belongsTo', false);
existsAndShared('hasAndBelongsToMany', false);
existsAndShared('save', false);
existsAndShared('isNewRecord', false);
existsAndShared('_adapter', false);
existsAndShared('destroyById', true);
existsAndShared('destroy', false);
existsAndShared('updateAttributes', true);
existsAndShared('updateAll', true);
existsAndShared('reload', false);
function existsAndShared(Model, name, isRemoteEnabled, isProto) {
var scope = isProto ? Model.prototype : Model;