YUKI Hiroshi
null+****@clear*****
Mon Jun 15 18:19:03 JST 2015
YUKI Hiroshi 2015-06-15 18:19:03 +0900 (Mon, 15 Jun 2015) New Revision: 769e9e68aa08b19286f0eef594b9b0e5adf6529e https://github.com/droonga/express-droonga/commit/769e9e68aa08b19286f0eef594b9b0e5adf6529e Message: Extract common utilities to simulate get/post requests Modified files: test/adapter/api/groonga/load.test.js Modified: test/adapter/api/groonga/load.test.js (+45 -45) =================================================================== --- test/adapter/api/groonga/load.test.js 2015-04-29 23:48:24 +0900 (55971c3) +++ test/adapter/api/groonga/load.test.js 2015-06-15 18:19:03 +0900 (2224e1a) @@ -17,6 +17,51 @@ suite('adapter/api/groonga: load', function() { var successMessage = groongaUtils.successMessage; + function post(body, additionalQuery) { + var requestBody; + backend.reserveResponse(function(requestPacket) { + requestBody = requestPacket[2].body; + return utils.createReplyPacket(requestPacket, successMessage); + }); + var path = { + pathname: '/d/load', + query: { + table: 'Memos' + } + }; + if (additionalQuery) { + Object.keys(additionalQuery).forEach(function(key) { + path.query[key] = additionalQuery[key]; + }); + } + + return utils.post(path, JSON.stringify(body)) + .then(function(request) { + return requestBody; + }); + } + + function get(values) { + var requestBody; + backend.reserveResponse(function(requestPacket) { + requestBody = requestPacket[2].body; + return utils.createReplyPacket(requestPacket, successMessage); + }); + + var path = { + pathname: '/d/load', + query: { + table: 'Users', + values: JSON.stringify(values) + } + }; + + return utils.get(path) + .then(function(response) { + return requestBody; + }); + }; + setup(function(done) { utils.setupApplication() .then(function(result) { @@ -174,30 +219,6 @@ suite('adapter/api/groonga: load', function() { }); suite('POST', function() { - function post(body, additionalQuery) { - var requestBody; - backend.reserveResponse(function(requestPacket) { - requestBody = requestPacket[2].body; - return utils.createReplyPacket(requestPacket, successMessage); - }); - var path = { - pathname: '/d/load', - query: { - table: 'Memos' - } - }; - if (additionalQuery) { - Object.keys(additionalQuery).forEach(function(key) { - path.query[key] = additionalQuery[key]; - }); - } - - return utils.post(path, JSON.stringify(body)) - .then(function(request) { - return requestBody; - }); - } - suite('object style', function() { test('no _key', function(done) { var body = [ @@ -332,27 +353,6 @@ suite('adapter/api/groonga: load', function() { }); suite('GET', function() { - function get(values) { - var requestBody; - backend.reserveResponse(function(requestPacket) { - requestBody = requestPacket[2].body; - return utils.createReplyPacket(requestPacket, successMessage); - }); - - var path = { - pathname: '/d/load', - query: { - table: 'Users', - values: JSON.stringify(values) - } - }; - - return utils.get(path) - .then(function(response) { - return requestBody; - }); - }; - test('object style', function(done) { var values = [ { -------------- next part -------------- HTML����������������������������...下載
