Yoji SHIDARA
null+****@clear*****
Thu Aug 22 17:31:07 JST 2013
Yoji SHIDARA 2013-08-22 17:31:07 +0900 (Thu, 22 Aug 2013) New Revision: c53a818ad3e85af0a4ebcbb28919bc16e6cd0955 https://github.com/droonga/express-droonga/commit/c53a818ad3e85af0a4ebcbb28919bc16e6cd0955 Message: Use utils.allElements instead of utils.outputAll Modified files: test/adapter/rest.test.js test/rest-request-builder.test.js test/test-utils.js Modified: test/adapter/rest.test.js (+3 -1) =================================================================== --- test/adapter/rest.test.js 2013-08-22 17:21:45 +0900 (e54f5f1) +++ test/adapter/rest.test.js 2013-08-22 17:31:07 +0900 (7b78d93) @@ -200,7 +200,9 @@ suite('HTTP Adapter', function() { result: { source: 'foo', query: 'bar', - output: utils.outputAll + output: { + elements: utils.allElements + } } } }; Modified: test/rest-request-builder.test.js (+6 -12) =================================================================== --- test/rest-request-builder.test.js 2013-08-22 17:21:45 +0900 (8f899c4) +++ test/rest-request-builder.test.js 2013-08-22 17:31:07 +0900 (fbbafa7) @@ -6,16 +6,6 @@ var builders = require('../lib/adapter/api/rest-request-builder'); suite('building message from REST adapter request', function() { suite('search', function() { - var outputAll = { - elements: [ - 'startTime', - 'elapsedTime', - 'count', - 'attributes', - 'records' - ] - }; - test('simple query', function() { var fakeRequest = { params: { @@ -30,7 +20,9 @@ suite('building message from REST adapter request', function() { result: { source: 'test_table', query: 'foobar', - output: outputAll + output: { + elements: utils.allElements + } } } }; @@ -64,7 +56,9 @@ suite('building message from REST adapter request', function() { matchTo: ['realname', 'nickname'], sortBy: ['-realname', '-nickname'], attributes: ['realname', 'nickname', 'age', 'job'], - output: outputAll + output: { + elements: utils.allElements + } } } }; Modified: test/test-utils.js (+7 -9) =================================================================== --- test/test-utils.js 2013-08-22 17:21:45 +0900 (0026baa) +++ test/test-utils.js 2013-08-22 17:31:07 +0900 (1d1e8e7) @@ -409,12 +409,10 @@ function assertEqualJSON(actual, expected) { } assert.equalJSON = assertEqualJSON; -exports.outputAll = { - elements: [ - 'startTime', - 'elapsedTime', - 'count', - 'attributes', - 'records' - ] -}; +exports.allElements = [ + 'startTime', + 'elapsedTime', + 'count', + 'attributes', + 'records' +]; -------------- next part -------------- HTML����������������������������...Download