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 #2670 from strongloop/reorder_patch_put 

Reorder PATCH Vs PUT endpoints
This commit is contained in:
Amirali Jafarian 2016-08-26 16:09:43 -04:00 committed by GitHub
parent 4ec0ac2218 b80666a507
commit 358fdbf184
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/persisted-model.js
View File

@ -635,7 +635,7 @@ module.exports = function(registry) {
}; };
if (!options.replaceOnPUT) { if (!options.replaceOnPUT) {
upsertOptions.http.push({ verb: 'put', path: '/' }); upsertOptions.http.unshift({ verb: 'put', path: '/' });
} }
setRemoting(PersistedModel, 'patchOrCreate', upsertOptions); setRemoting(PersistedModel, 'patchOrCreate', upsertOptions);
@ -802,7 +802,7 @@ module.exports = function(registry) {
setRemoting(PersistedModel.prototype, 'patchAttributes', updateAttributesOptions); setRemoting(PersistedModel.prototype, 'patchAttributes', updateAttributesOptions);
if (!options.replaceOnPUT) { if (!options.replaceOnPUT) {
updateAttributesOptions.http.push({ verb: 'put', path: '/' }); updateAttributesOptions.http.unshift({ verb: 'put', path: '/' });
} }
if (options.trackChanges || options.enableRemoteReplication) { if (options.trackChanges || options.enableRemoteReplication) {

17
test/remoting.integration.js
View File

@ -198,15 +198,26 @@ describe('With model.settings.replaceOnPUT false', function() {
var methods = getFormattedMethodsExcludingRelations(storeClass.methods); var methods = getFormattedMethodsExcludingRelations(storeClass.methods);
var expectedMethods = [ var expectedMethods = [
'patchOrCreate(data:object):storeWithReplaceOnPUTfalse PATCH /stores-updating', 'create(data:object):storeWithReplaceOnPUTfalse POST /stores-updating',
'patchOrCreate(data:object):storeWithReplaceOnPUTfalse PUT /stores-updating', 'patchOrCreate(data:object):storeWithReplaceOnPUTfalse PUT /stores-updating',
'patchOrCreate(data:object):storeWithReplaceOnPUTfalse PATCH /stores-updating',
'replaceOrCreate(data:object):storeWithReplaceOnPUTfalse POST /stores-updating/replaceOrCreate', 'replaceOrCreate(data:object):storeWithReplaceOnPUTfalse POST /stores-updating/replaceOrCreate',
'exists(id:any):boolean GET /stores-updating/:id/exists',
'exists(id:any):boolean HEAD /stores-updating/:id',
'findById(id:any,filter:object):storeWithReplaceOnPUTfalse GET /stores-updating/:id',
'replaceById(id:any,data:object):storeWithReplaceOnPUTfalse POST /stores-updating/:id/replace', 'replaceById(id:any,data:object):storeWithReplaceOnPUTfalse POST /stores-updating/:id/replace',
'prototype.patchAttributes(data:object):storeWithReplaceOnPUTfalse PATCH /stores-updating/:id', 'find(filter:object):storeWithReplaceOnPUTfalse GET /stores-updating',
'findOne(filter:object):storeWithReplaceOnPUTfalse GET /stores-updating/findOne',
'updateAll(where:object,data:object):object POST /stores-updating/update',
'deleteById(id:any):object DELETE /stores-updating/:id',
'count(where:object):number GET /stores-updating/count',
'prototype.patchAttributes(data:object):storeWithReplaceOnPUTfalse PUT /stores-updating/:id', 'prototype.patchAttributes(data:object):storeWithReplaceOnPUTfalse PUT /stores-updating/:id',
'prototype.patchAttributes(data:object):storeWithReplaceOnPUTfalse PATCH /stores-updating/:id',
'createChangeStream(options:object):ReadableStream POST /stores-updating/change-stream',
'createChangeStream(options:object):ReadableStream GET /stores-updating/change-stream',
]; ];
expect(methods).to.include.members(expectedMethods); expect(methods).to.eql(expectedMethods);
}); });
}); });