YUKI Hiroshi
null+****@clear*****
Wed Feb 6 12:41:02 JST 2013
YUKI Hiroshi 2013-02-06 12:41:02 +0900 (Wed, 06 Feb 2013) New Revision: c9d247d4c7278d5b3cff7f69b55c7569d6346d89 https://github.com/groonga/express-kotoumi/commit/c9d247d4c7278d5b3cff7f69b55c7569d6346d89 Log: Update registeration process of expectations about socket.io API commands for mocked connections Modified files: test/test-utils.js Modified: test/test-utils.js (+12 -3) =================================================================== --- test/test-utils.js 2013-02-06 12:31:01 +0900 (f33a83c) +++ test/test-utils.js 2013-02-06 12:41:02 +0900 (1d51e8a) @@ -6,7 +6,7 @@ var http = require('http'); var Deferred = require('jsdeferred').Deferred; var client = require('socket.io-client'); -var socketIoAdaptor = require('../lib/frontend/socket.io-adaptor'); +var socketIoDefaultCommands = require('../lib/frontend/default-commands/socket.io'); var testSendPort = exports.testSendPort = 3333; var testReceivePort = exports.testReceivePort = 3334; @@ -138,7 +138,9 @@ exports.createClientSocket = createClientSocket; function createMockedBackendConnection() { var connection = nodemock; var onMessageControllers = {}; - socketIoAdaptor.commands.forEach(function(command) { + Object.keys(socketIoDefaultCommands).forEach(function(command) { + if (!command || typeof command != 'object') + return; onMessageControllers[command] = {}; connection = connection .mock('on') @@ -170,10 +172,17 @@ function createStubbedBackendConnection() { exports.createStubbedBackendConnection = createStubbedBackendConnection; function readyToDestroyMockedConnection(connection) { + var commands = []; + Object.keys(socketIoDefaultCommands).forEach(function(command) { + if (!command || typeof command != 'object') + return; + commands.push(command); + }); + connection = connection .mock('removeListener') .takes('message', function() {}) - .times(socketIoAdaptor.commands.length) + .times(commands.length) .mock('removeListener') .takes('error', function() {}); return connection; -------------- next part -------------- HTML����������������������������... Download