From 6588c3de4ae80b1596fa75c0730954f50b5e16f0 Mon Sep 17 00:00:00 2001 From: scottinet Date: Tue, 12 Jan 2016 11:29:46 +0100 Subject: [PATCH] updated dependencies --- config/defaultPlugins.json | 2 +- package.json | 39 +++++++++---------- test/api/controllers/adminController.test.js | 2 - test/api/controllers/authController.test.js | 2 - test/api/controllers/bulkController.test.js | 2 - .../funnelController/execute.test.js | 2 - test/api/controllers/readController.test.js | 2 - .../routerController/executeFromRest.test.js | 2 - .../routerController/initRouterHttp.test.js | 2 - .../routerController/routeMQListener.test.js | 2 - .../routerController/routerController.test.js | 2 - .../controllers/subscribeController.test.js | 2 - test/api/controllers/writeController.test.js | 2 - .../core/hotelClerck/addSubscription.test.js | 2 - .../hotelClerck/countSubscription.test.js | 2 - .../hotelClerck/listSubscriptions.test.js | 2 - .../core/hotelClerck/removeAllRooms.test.js | 2 - .../removeCustomerFromAllRooms.test.js | 2 - .../hotelClerck/removeSubscription.test.js | 2 - test/api/core/models/requestObject.test.js | 2 - test/api/core/notifier/init.test.js | 2 - test/api/core/notifier/notify.test.js | 2 - .../notifier/notifyDocumentCreate.test.js | 2 - .../notifier/notifyDocumentDelete.test.js | 2 - .../notifier/notifyDocumentUpdate.test.js | 2 - test/api/core/notifier/publish.test.js | 2 - test/api/core/notifier/send.test.js | 2 - .../core/notifier/workerNotification.test.js | 2 - test/api/core/pluginsManager/run.test.js | 2 - test/api/core/sandbox/sandbox.test.js | 2 - test/api/core/servers.test.js | 2 - test/api/core/statistics.test.js | 2 - test/api/core/workerListener.test.js | 2 - .../index/addCollectionSubscription.test.js | 2 - test/api/dsl/index/addCurriedFunction.test.js | 2 - test/api/dsl/index/removeRoom.test.js | 2 - .../dsl/index/removeRoomFromFields.test.js | 2 - test/api/dsl/index/testFieldFilters.test.js | 2 - test/api/dsl/index/testFilters.test.js | 2 - test/api/dsl/index/testGlobalsFilter.test.js | 2 - test/api/dsl/index/testRooms.test.js | 2 - test/api/dsl/methods/and.test.js | 2 - test/api/dsl/methods/bool.test.js | 2 - test/api/dsl/methods/exists.test.js | 2 - test/api/dsl/methods/geoBoundingBox.test.js | 2 - test/api/dsl/methods/geoDistance.test.js | 2 +- test/api/dsl/methods/geoDistanceRange.test.js | 2 +- test/api/dsl/methods/geoPolygon.test.js | 2 +- test/api/dsl/methods/geoUtil.test.js | 2 +- .../dsl/methods/getFormattedFilters.test.js | 2 +- test/api/dsl/methods/ids.test.js | 2 +- test/api/dsl/methods/missing.test.js | 2 +- test/api/dsl/methods/must.test.js | 2 +- test/api/dsl/methods/mustNot.test.js | 2 +- test/api/dsl/methods/or.test.js | 2 +- test/api/dsl/methods/range.test.js | 2 +- test/api/dsl/methods/should.test.js | 2 +- test/api/dsl/methods/termFunction.test.js | 2 +- test/api/dsl/methods/unimplemented.test.js | 2 +- test/hooks/index.test.js | 2 +- test/services/broker.test.js | 2 +- .../implementations/elasticsearch.test.js | 2 +- .../implementations/internalbroker.test.js | 2 +- test/services/redis.test.js | 2 +- test/workers/write.test.js | 2 +- 65 files changed, 40 insertions(+), 127 deletions(-) diff --git a/config/defaultPlugins.json b/config/defaultPlugins.json index 9e084c193e..2237ba60fa 100644 --- a/config/defaultPlugins.json +++ b/config/defaultPlugins.json @@ -11,7 +11,7 @@ } }, "kuzzle-plugin-socketio": { - "version": "1.0.3", + "version": "1.0.4", "activated": true, "name": "kuzzle-plugin-socketio", "defaultConfig": { diff --git a/package.json b/package.json index 8d5ba2d822..b877098c31 100644 --- a/package.json +++ b/package.json @@ -25,32 +25,32 @@ }, "dependencies": { "amqplib": "0.4.0", - "async": "1.5.0", + "async": "1.5.2", "big.js": "3.1.3", - "body-parser": "1.14.1", + "body-parser": "1.14.2", "bunyan": "^1.5.1", "commander": "2.9.0", - "elasticsearch": "9.0.0", + "elasticsearch": "10.1.2", "eventemitter2": "^0.4.14", - "finalhandler": "0.4.0", + "finalhandler": "0.4.1", "geolib": "j33f/Geolib", "json-stable-stringify": "1.0.0", "jsonwebtoken": "^5.4.0", "lodash": "3.10.1", - "newrelic": "1.23.0", + "newrelic": "1.24.1", "ngeohash": "0.6.0", "node-units": "0.1.5", - "node-uuid": "1.4.3", + "node-uuid": "1.4.7", "passport": "0.3.2", "portfinder": "^0.4.0", "proper-lockfile": "^1.1.1", "q": "2.0.3", - "rc": "1.1.2", - "redis": "2.3.0", + "rc": "1.1.6", + "redis": "2.4.2", "request-promise": "1.0.2", "router": "1.1.3", "walk": "2.3.9", - "ws": "0.8.0" + "ws": "1.0.1" }, "repository": { "type": "git", @@ -58,20 +58,19 @@ }, "devDependencies": { "codecov.io": "^0.1.6", - "cucumber": "0.8.1", - "eslint": "1.8.0", + "cucumber": "0.9.2", + "eslint": "1.10.3", "grunt": "^0.4.5", "grunt-contrib-jshint": "^0.11.3", "gruntify-eslint": "^1.0.1", - "istanbul": "0.4.0", - "istanbul-middleware": "0.2.1", - "mocha": "2.3.3", - "mqtt": "1.5.0", - "rewire": "2.3.4", - "should": "7.1.1", - "should-promised": "0.3.1", - "socket.io-client": "1.3.7", - "stomp-client": "0.8.0" + "istanbul": "0.4.2", + "istanbul-middleware": "0.2.2", + "mocha": "2.3.4", + "mqtt": "1.6.3", + "rewire": "2.5.1", + "should": "8.1.1", + "socket.io-client": "1.4.4", + "stomp-client": "0.8.1" }, "engines": { "node": ">= 4.1.1", diff --git a/test/api/controllers/adminController.test.js b/test/api/controllers/adminController.test.js index bac5d58e5e..54f6765f59 100644 --- a/test/api/controllers/adminController.test.js +++ b/test/api/controllers/adminController.test.js @@ -5,8 +5,6 @@ var RequestObject = require.main.require('lib/api/core/models/requestObject'), ResponseObject = require.main.require('lib/api/core/models/responseObject'); -require('should-promised'); - describe('Test: admin controller', function () { var kuzzle, diff --git a/test/api/controllers/authController.test.js b/test/api/controllers/authController.test.js index c48bc108c8..7edb259f60 100644 --- a/test/api/controllers/authController.test.js +++ b/test/api/controllers/authController.test.js @@ -11,8 +11,6 @@ var MockupWrapper, MockupStrategy; -require('should-promised'); - MockupStrategy = function(name, verify) { var options = {}; diff --git a/test/api/controllers/bulkController.test.js b/test/api/controllers/bulkController.test.js index ed68f1cfef..b1ce1f9b15 100644 --- a/test/api/controllers/bulkController.test.js +++ b/test/api/controllers/bulkController.test.js @@ -4,8 +4,6 @@ var Kuzzle = require.main.require('lib/api/Kuzzle'), RequestObject = require.main.require('lib/api/core/models/requestObject'); -require('should-promised'); - describe('Test the bulk controller', function () { var kuzzle, diff --git a/test/api/controllers/funnelController/execute.test.js b/test/api/controllers/funnelController/execute.test.js index 6b77ed3dfe..d7e67ca2a2 100644 --- a/test/api/controllers/funnelController/execute.test.js +++ b/test/api/controllers/funnelController/execute.test.js @@ -8,8 +8,6 @@ var Role = require.main.require('lib/api/core/models/security/role'), User = require.main.require('lib/api/core/models/security/user'); -require('should-promised'); - describe('Test execute function in funnel controller', function () { var diff --git a/test/api/controllers/readController.test.js b/test/api/controllers/readController.test.js index 398749b16c..57f9c7e45f 100644 --- a/test/api/controllers/readController.test.js +++ b/test/api/controllers/readController.test.js @@ -9,8 +9,6 @@ var Profile = require.main.require('lib/api/core/models/security/profile'), Role = require.main.require('lib/api/core/models/security/role'); -require('should-promised'); - /* * Since we're querying the database for non-existent documents, we expect * most of these calls, if not all, to return a rejected promise. diff --git a/test/api/controllers/routerController/executeFromRest.test.js b/test/api/controllers/routerController/executeFromRest.test.js index 2a7c139b93..fdd65284f8 100644 --- a/test/api/controllers/routerController/executeFromRest.test.js +++ b/test/api/controllers/routerController/executeFromRest.test.js @@ -12,8 +12,6 @@ var RouterController = rewire('../../../../lib/api/controllers/routerController'), ResponseObject = require.main.require('lib/api/core/models/responseObject'); -require('should-promised'); - describe('Test: routerController.executeFromRest', function () { var timer, diff --git a/test/api/controllers/routerController/initRouterHttp.test.js b/test/api/controllers/routerController/initRouterHttp.test.js index 94d2c72eba..42c355eedb 100644 --- a/test/api/controllers/routerController/initRouterHttp.test.js +++ b/test/api/controllers/routerController/initRouterHttp.test.js @@ -13,8 +13,6 @@ var RouterController = rewire('../../../../lib/api/controllers/routerController'), RequestObject = require.main.require('lib/api/core/models/requestObject'); -require('should-promised'); - /* * This function helps keeping tests simple and clear while ensuring that * responses are well-formed. diff --git a/test/api/controllers/routerController/routeMQListener.test.js b/test/api/controllers/routerController/routeMQListener.test.js index 9913210f13..cb1f0b2390 100644 --- a/test/api/controllers/routerController/routeMQListener.test.js +++ b/test/api/controllers/routerController/routeMQListener.test.js @@ -13,8 +13,6 @@ var ResponseObject = require.main.require('lib/api/core/models/responseObject'); -require('should-promised'); - describe('Test: routerController.routeMQListener', function () { var kuzzle, diff --git a/test/api/controllers/routerController/routerController.test.js b/test/api/controllers/routerController/routerController.test.js index dde9dcc991..20e4613a7e 100644 --- a/test/api/controllers/routerController/routerController.test.js +++ b/test/api/controllers/routerController/routerController.test.js @@ -9,8 +9,6 @@ var ResponseObject = require.main.require('lib/api/core/models/responseObject'), PluginImplementationError = require.main.require('lib/api/core/errors/pluginImplementationError'); -require('should-promised'); - describe('Test: routerController', () => { describe('#getBearerTokenFromHeaders', () => { var diff --git a/test/api/controllers/subscribeController.test.js b/test/api/controllers/subscribeController.test.js index 2981c94ea6..42c3a1af2e 100644 --- a/test/api/controllers/subscribeController.test.js +++ b/test/api/controllers/subscribeController.test.js @@ -8,8 +8,6 @@ var BadRequestError = require.main.require('lib/api/core/errors/badRequestError'), NotFoundError = require.main.require('lib/api/core/errors/notFoundError'); -require('should-promised'); - /* * Since we're sending voluntarily false requests, we expect most of these * calls to fail. diff --git a/test/api/controllers/writeController.test.js b/test/api/controllers/writeController.test.js index ddf5ba0764..470e602b3d 100644 --- a/test/api/controllers/writeController.test.js +++ b/test/api/controllers/writeController.test.js @@ -4,8 +4,6 @@ var Kuzzle = require.main.require('lib/api/Kuzzle'), RequestObject = require.main.require('lib/api/core/models/requestObject'); -require('should-promised'); - /* * Since we're sending voluntarily false requests, we expect most of these * calls to fail. diff --git a/test/api/core/hotelClerck/addSubscription.test.js b/test/api/core/hotelClerck/addSubscription.test.js index ec517b1af3..24ac4ea949 100644 --- a/test/api/core/hotelClerck/addSubscription.test.js +++ b/test/api/core/hotelClerck/addSubscription.test.js @@ -9,8 +9,6 @@ var Profile = require.main.require('lib/api/core/models/security/profile'), Role = require.main.require('lib/api/core/models/security/role'); -require('should-promised'); - describe('Test: hotelClerk.addSubscription', function () { var kuzzle, diff --git a/test/api/core/hotelClerck/countSubscription.test.js b/test/api/core/hotelClerck/countSubscription.test.js index 3fee14bb5c..e287199fd1 100644 --- a/test/api/core/hotelClerck/countSubscription.test.js +++ b/test/api/core/hotelClerck/countSubscription.test.js @@ -8,8 +8,6 @@ var BadRequestError = require.main.require('lib/api/core/errors/badRequestError'), NotFoundError = require.main.require('lib/api/core/errors/notFoundError'); -require('should-promised'); - describe('Test: hotelClerk.countSubscription', function () { var anonymousUser, diff --git a/test/api/core/hotelClerck/listSubscriptions.test.js b/test/api/core/hotelClerck/listSubscriptions.test.js index 730292f57f..8b8f9d9b26 100644 --- a/test/api/core/hotelClerck/listSubscriptions.test.js +++ b/test/api/core/hotelClerck/listSubscriptions.test.js @@ -7,8 +7,6 @@ var Profile = require.main.require('lib/api/core/models/security/profile'), Role = require.main.require('lib/api/core/models/security/role'); -require('should-promised'); - describe('Test: hotelClerk.addSubscription', function () { var kuzzle, diff --git a/test/api/core/hotelClerck/removeAllRooms.test.js b/test/api/core/hotelClerck/removeAllRooms.test.js index 15e44844be..babd64cd95 100644 --- a/test/api/core/hotelClerck/removeAllRooms.test.js +++ b/test/api/core/hotelClerck/removeAllRooms.test.js @@ -8,8 +8,6 @@ var Profile = require.main.require('lib/api/core/models/security/profile'), Role = require.main.require('lib/api/core/models/security/role'); -require('should-promised'); - describe('Test: hotelClerk.removeRooms', function () { var kuzzle, diff --git a/test/api/core/hotelClerck/removeCustomerFromAllRooms.test.js b/test/api/core/hotelClerck/removeCustomerFromAllRooms.test.js index 72c433a003..4fa615ef0d 100644 --- a/test/api/core/hotelClerck/removeCustomerFromAllRooms.test.js +++ b/test/api/core/hotelClerck/removeCustomerFromAllRooms.test.js @@ -7,8 +7,6 @@ var Profile = require.main.require('lib/api/core/models/security/profile'), Role = require.main.require('lib/api/core/models/security/role'); -require('should-promised'); - describe('Test: hotelClerk.removeCustomerFromAllRooms', function () { var kuzzle, diff --git a/test/api/core/hotelClerck/removeSubscription.test.js b/test/api/core/hotelClerck/removeSubscription.test.js index d4979dd21f..9f7f3055b0 100644 --- a/test/api/core/hotelClerck/removeSubscription.test.js +++ b/test/api/core/hotelClerck/removeSubscription.test.js @@ -6,8 +6,6 @@ var Profile = require.main.require('lib/api/core/models/security/profile'), Role = require.main.require('lib/api/core/models/security/role'); -require('should-promised'); - describe('Test: hotelClerk.removeSubscription', function () { var diff --git a/test/api/core/models/requestObject.test.js b/test/api/core/models/requestObject.test.js index 9cfe9bccd1..a72ec8a865 100644 --- a/test/api/core/models/requestObject.test.js +++ b/test/api/core/models/requestObject.test.js @@ -8,8 +8,6 @@ var RequestObject = require.main.require('lib/api/core/models/requestObject'), BadRequestError = require.main.require('lib/api/core/errors/badRequestError'); -require('should-promised'); - describe('Test: requestObject', function () { var protocol = 'foobar', diff --git a/test/api/core/notifier/init.test.js b/test/api/core/notifier/init.test.js index 1be6a5c8eb..b6f1f49373 100644 --- a/test/api/core/notifier/init.test.js +++ b/test/api/core/notifier/init.test.js @@ -9,8 +9,6 @@ var Kuzzle = require.main.require('lib/api/Kuzzle'), Notifier = rewire('../../../../lib/api/core/notifier'); -require('should-promised'); - describe('Test: notifier.init', function () { var kuzzle; diff --git a/test/api/core/notifier/notify.test.js b/test/api/core/notifier/notify.test.js index 67535a9e70..7871ee9734 100644 --- a/test/api/core/notifier/notify.test.js +++ b/test/api/core/notifier/notify.test.js @@ -10,8 +10,6 @@ var Kuzzle = require.main.require('lib/api/Kuzzle'), Notifier = rewire('../../../../lib/api/core/notifier'); -require('should-promised'); - describe('Test: notifier.notify', function () { var kuzzle; diff --git a/test/api/core/notifier/notifyDocumentCreate.test.js b/test/api/core/notifier/notifyDocumentCreate.test.js index 06a9c88e19..d3d8b3dcca 100644 --- a/test/api/core/notifier/notifyDocumentCreate.test.js +++ b/test/api/core/notifier/notifyDocumentCreate.test.js @@ -15,8 +15,6 @@ var Kuzzle = require.main.require('lib/api/Kuzzle'), Notifier = rewire('../../../../lib/api/core/notifier'); -require('should-promised'); - var mockupCacheService = { id: undefined, room: undefined, diff --git a/test/api/core/notifier/notifyDocumentDelete.test.js b/test/api/core/notifier/notifyDocumentDelete.test.js index 94dedaa44c..0e23788726 100644 --- a/test/api/core/notifier/notifyDocumentDelete.test.js +++ b/test/api/core/notifier/notifyDocumentDelete.test.js @@ -14,8 +14,6 @@ var Kuzzle = require.main.require('lib/api/Kuzzle'), Notifier = rewire('../../../../lib/api/core/notifier'); -require('should-promised'); - var mockupCacheService = { id: undefined, diff --git a/test/api/core/notifier/notifyDocumentUpdate.test.js b/test/api/core/notifier/notifyDocumentUpdate.test.js index 9f1018ab7d..60699526ef 100644 --- a/test/api/core/notifier/notifyDocumentUpdate.test.js +++ b/test/api/core/notifier/notifyDocumentUpdate.test.js @@ -14,8 +14,6 @@ var Kuzzle = require.main.require('lib/api/Kuzzle'), Notifier = rewire('../../../../lib/api/core/notifier'); -require('should-promised'); - var mockupCacheService = { addId: undefined, removeId: undefined, diff --git a/test/api/core/notifier/publish.test.js b/test/api/core/notifier/publish.test.js index 2be48f0c4c..91ec384ea3 100644 --- a/test/api/core/notifier/publish.test.js +++ b/test/api/core/notifier/publish.test.js @@ -12,8 +12,6 @@ var ResponseObject = require.main.require('lib/api/core/models/responseObject'), Notifier = rewire('../../../../lib/api/core/notifier'); -require('should-promised'); - describe('Test: notifier.publish', function () { var kuzzle, diff --git a/test/api/core/notifier/send.test.js b/test/api/core/notifier/send.test.js index 49db82a933..c4a504079f 100644 --- a/test/api/core/notifier/send.test.js +++ b/test/api/core/notifier/send.test.js @@ -10,8 +10,6 @@ var Kuzzle = require.main.require('lib/api/Kuzzle'), Notifier = rewire('../../../../lib/api/core/notifier'); -require('should-promised'); - describe('Test: notifier.send', function () { var kuzzle; diff --git a/test/api/core/notifier/workerNotification.test.js b/test/api/core/notifier/workerNotification.test.js index 2902f58192..46ab9dfe05 100644 --- a/test/api/core/notifier/workerNotification.test.js +++ b/test/api/core/notifier/workerNotification.test.js @@ -15,8 +15,6 @@ var params = require('rc')('kuzzle'), Kuzzle = require.main.require('lib/api/Kuzzle'); -require('should-promised'); - describe('Test: notifier.workerNotification', function () { var requestObject = new RequestObject({ diff --git a/test/api/core/pluginsManager/run.test.js b/test/api/core/pluginsManager/run.test.js index 2825b05689..52a05cbd92 100644 --- a/test/api/core/pluginsManager/run.test.js +++ b/test/api/core/pluginsManager/run.test.js @@ -6,8 +6,6 @@ var EventEmitter = require('eventemitter2').EventEmitter2, GatewayTimeoutError = require.main.require('lib/api/core/errors/gatewayTimeoutError'); -require('should-promised'); - describe('Test plugins manager run', function () { var contextObjects = [ diff --git a/test/api/core/sandbox/sandbox.test.js b/test/api/core/sandbox/sandbox.test.js index ab06d3c171..4948baebbc 100644 --- a/test/api/core/sandbox/sandbox.test.js +++ b/test/api/core/sandbox/sandbox.test.js @@ -5,8 +5,6 @@ var GatewayTimeoutError = require.main.require('lib/api/core/errors/gatewayTimeoutError'), Sandbox = rewire('../../../../lib/api/core/sandbox'); -require('should-promised'); - describe('Test: sandbox/sandboxTest', () => { var sandbox; diff --git a/test/api/core/servers.test.js b/test/api/core/servers.test.js index 169ad40d88..43d26df327 100644 --- a/test/api/core/servers.test.js +++ b/test/api/core/servers.test.js @@ -9,8 +9,6 @@ var Kuzzle = require.main.require('lib/api/Kuzzle'), Servers = rewire('../../../lib/api/core/servers'); -require('should-promised'); - describe('Test: core/servers', function () { var kuzzle, diff --git a/test/api/core/statistics.test.js b/test/api/core/statistics.test.js index 9b8db82d96..500bb5ee37 100644 --- a/test/api/core/statistics.test.js +++ b/test/api/core/statistics.test.js @@ -9,8 +9,6 @@ var RequestObject = require.main.require('lib/api/core/models/requestObject'), Statistics = rewire('../../../lib/api/core/statistics'); -require('should-promised'); - describe('Test: statistics core component', function () { var requestObject, diff --git a/test/api/core/workerListener.test.js b/test/api/core/workerListener.test.js index 898a2834f4..a32945154a 100644 --- a/test/api/core/workerListener.test.js +++ b/test/api/core/workerListener.test.js @@ -11,8 +11,6 @@ var ResponseObject = require.main.require('lib/api/core/models/responseObject'), WorkerListener = rewire('../../../lib/api/core/workerListener'); -require('should-promised'); - describe('Test: workerListener', function () { var kuzzle, diff --git a/test/api/dsl/index/addCollectionSubscription.test.js b/test/api/dsl/index/addCollectionSubscription.test.js index 9f6f22ed47..684e0be902 100644 --- a/test/api/dsl/index/addCollectionSubscription.test.js +++ b/test/api/dsl/index/addCollectionSubscription.test.js @@ -2,8 +2,6 @@ var should = require('should'), Dsl = require.main.require('lib/api/dsl/index'); -require('should-promised'); - describe('Test: dsl.addCollectionSubscription', function () { var dsl, index = 'test'; diff --git a/test/api/dsl/index/addCurriedFunction.test.js b/test/api/dsl/index/addCurriedFunction.test.js index 44f829b476..31198e3b42 100644 --- a/test/api/dsl/index/addCurriedFunction.test.js +++ b/test/api/dsl/index/addCurriedFunction.test.js @@ -2,8 +2,6 @@ var should = require('should'), Dsl = require.main.require('lib/api/dsl/index'); -require('should-promised'); - describe('Test: dsl.addCurriedFunction', function () { var diff --git a/test/api/dsl/index/removeRoom.test.js b/test/api/dsl/index/removeRoom.test.js index dc11bf5c82..b978956a9e 100644 --- a/test/api/dsl/index/removeRoom.test.js +++ b/test/api/dsl/index/removeRoom.test.js @@ -8,8 +8,6 @@ var Profile = require.main.require('lib/api/core/models/security/profile'), Role = require.main.require('lib/api/core/models/security/role'); -require('should-promised'); - describe('Test removeRoom function index.js file from DSL', function () { var kuzzle, diff --git a/test/api/dsl/index/removeRoomFromFields.test.js b/test/api/dsl/index/removeRoomFromFields.test.js index cf4bda7532..6e1fb15bb4 100644 --- a/test/api/dsl/index/removeRoomFromFields.test.js +++ b/test/api/dsl/index/removeRoomFromFields.test.js @@ -3,8 +3,6 @@ var rewire = require('rewire'), Dsl = rewire('../../../../lib/api/dsl/index'); -require('should-promised'); - describe('Test: dsl.removeRoomFromFields', function () { var dsl, diff --git a/test/api/dsl/index/testFieldFilters.test.js b/test/api/dsl/index/testFieldFilters.test.js index 8934ffce3a..5a611741ad 100644 --- a/test/api/dsl/index/testFieldFilters.test.js +++ b/test/api/dsl/index/testFieldFilters.test.js @@ -4,8 +4,6 @@ var RequestObject = require.main.require('lib/api/core/models/requestObject'), Dsl = rewire('../../../../lib/api/dsl/index'); -require('should-promised'); - describe('Test: dsl.testFieldFilters', function () { var testFieldFilters = Dsl.__get__('testFieldFilters'), diff --git a/test/api/dsl/index/testFilters.test.js b/test/api/dsl/index/testFilters.test.js index ba8bb9bd51..e7d28f3c72 100644 --- a/test/api/dsl/index/testFilters.test.js +++ b/test/api/dsl/index/testFilters.test.js @@ -8,8 +8,6 @@ var Profile = require.main.require('lib/api/core/models/security/profile'), Role = require.main.require('lib/api/core/models/security/role'); -require('should-promised'); - describe('Test: dsl.testFilters', function () { var kuzzle, diff --git a/test/api/dsl/index/testGlobalsFilter.test.js b/test/api/dsl/index/testGlobalsFilter.test.js index 7153662f77..aeb988c509 100644 --- a/test/api/dsl/index/testGlobalsFilter.test.js +++ b/test/api/dsl/index/testGlobalsFilter.test.js @@ -4,8 +4,6 @@ var RequestObject = require.main.require('lib/api/core/models/requestObject'), Dsl = rewire('../../../../lib/api/dsl/index'); -require('should-promised'); - describe('Test: dsl.testGlobalsFilters', function () { var testGlobalsFilters = Dsl.__get__('testGlobalsFilters'), diff --git a/test/api/dsl/index/testRooms.test.js b/test/api/dsl/index/testRooms.test.js index ecf26e5c9a..5fcbfcb389 100644 --- a/test/api/dsl/index/testRooms.test.js +++ b/test/api/dsl/index/testRooms.test.js @@ -5,8 +5,6 @@ var rewire = require('rewire'), Dsl = rewire('../../../../lib/api/dsl/index'); -require('should-promised'); - describe('Test: dsl.removeRoomFromFields', function () { var kuzzle, diff --git a/test/api/dsl/methods/and.test.js b/test/api/dsl/methods/and.test.js index 8b28a3c5fb..6ad9caf6f0 100644 --- a/test/api/dsl/methods/and.test.js +++ b/test/api/dsl/methods/and.test.js @@ -3,8 +3,6 @@ var rewire = require('rewire'), methods = rewire('../../../../lib/api/dsl/methods'); -require('should-promised'); - describe('Test and method', function () { var diff --git a/test/api/dsl/methods/bool.test.js b/test/api/dsl/methods/bool.test.js index 3e502859e1..47dbe4c41c 100644 --- a/test/api/dsl/methods/bool.test.js +++ b/test/api/dsl/methods/bool.test.js @@ -4,8 +4,6 @@ var methods = rewire('../../../../lib/api/dsl/methods'), BadRequestError = require.main.require('lib/api/core/errors/badRequestError'); -require('should-promised'); - describe('Test bool method', function () { var diff --git a/test/api/dsl/methods/exists.test.js b/test/api/dsl/methods/exists.test.js index 5735f1b67f..f15c2b48ab 100644 --- a/test/api/dsl/methods/exists.test.js +++ b/test/api/dsl/methods/exists.test.js @@ -5,8 +5,6 @@ var BadRequestError = require.main.require('lib/api/core/errors/badRequestError'), InternalError = require.main.require('lib/api/core/errors/internalError'); -require('should-promised'); - describe('Test exists method', function () { var diff --git a/test/api/dsl/methods/geoBoundingBox.test.js b/test/api/dsl/methods/geoBoundingBox.test.js index a49bf475fa..38706ead2c 100644 --- a/test/api/dsl/methods/geoBoundingBox.test.js +++ b/test/api/dsl/methods/geoBoundingBox.test.js @@ -5,8 +5,6 @@ var BadRequestError = require.main.require('lib/api/core/errors/badRequestError'), InternalError = require.main.require('lib/api/core/errors/internalError'); -require('should-promised'); - describe('Test geoboundingbox method', function () { var roomId = 'roomId', diff --git a/test/api/dsl/methods/geoDistance.test.js b/test/api/dsl/methods/geoDistance.test.js index 101dd88721..b1933fb093 100644 --- a/test/api/dsl/methods/geoDistance.test.js +++ b/test/api/dsl/methods/geoDistance.test.js @@ -5,7 +5,7 @@ var BadRequestError = require.main.require('lib/api/core/errors/badRequestError'), InternalError = require.main.require('lib/api/core/errors/internalError'); -require('should-promised'); + describe('Test geoDistance method', function () { var diff --git a/test/api/dsl/methods/geoDistanceRange.test.js b/test/api/dsl/methods/geoDistanceRange.test.js index 5443cb4a31..c70b1ba92c 100644 --- a/test/api/dsl/methods/geoDistanceRange.test.js +++ b/test/api/dsl/methods/geoDistanceRange.test.js @@ -5,7 +5,7 @@ var BadRequestError = require.main.require('lib/api/core/errors/badRequestError'), InternalError = require.main.require('lib/api/core/errors/internalError'); -require('should-promised'); + describe('Test geoDistanceRange method', function () { var diff --git a/test/api/dsl/methods/geoPolygon.test.js b/test/api/dsl/methods/geoPolygon.test.js index 8cc35d71cf..da24e7ee6d 100755 --- a/test/api/dsl/methods/geoPolygon.test.js +++ b/test/api/dsl/methods/geoPolygon.test.js @@ -5,7 +5,7 @@ var BadRequestError = require.main.require('lib/api/core/errors/badRequestError'), InternalError = require.main.require('lib/api/core/errors/internalError'); -require('should-promised'); + describe('Test geoPolygon method', function () { var diff --git a/test/api/dsl/methods/geoUtil.test.js b/test/api/dsl/methods/geoUtil.test.js index 651886c7eb..6eae1cde2b 100644 --- a/test/api/dsl/methods/geoUtil.test.js +++ b/test/api/dsl/methods/geoUtil.test.js @@ -5,7 +5,7 @@ var KuzzleError = require.main.require('lib/api/core/errors/kuzzleError'), geohash = require('ngeohash'); -require('should-promised'); + describe('Test geoUtil methods included in the DSL methods file', function () { var result, diff --git a/test/api/dsl/methods/getFormattedFilters.test.js b/test/api/dsl/methods/getFormattedFilters.test.js index 99fd1b4544..b59e35e5a5 100644 --- a/test/api/dsl/methods/getFormattedFilters.test.js +++ b/test/api/dsl/methods/getFormattedFilters.test.js @@ -4,7 +4,7 @@ var methods = rewire('../../../../lib/api/dsl/methods'), BadRequestError = require.main.require('lib/api/core/errors/badRequestError'); -require('should-promised'); + describe('Test: dsl.getFormattedFilters method', function () { var diff --git a/test/api/dsl/methods/ids.test.js b/test/api/dsl/methods/ids.test.js index b274d051d5..63973de18b 100644 --- a/test/api/dsl/methods/ids.test.js +++ b/test/api/dsl/methods/ids.test.js @@ -5,7 +5,7 @@ var BadRequestError = require.main.require('lib/api/core/errors/badRequestError'), InternalError = require.main.require('lib/api/core/errors/internalError'); -require('should-promised'); + describe('Test ids method', function () { diff --git a/test/api/dsl/methods/missing.test.js b/test/api/dsl/methods/missing.test.js index 6e8388e72a..eeb9a6b2bb 100644 --- a/test/api/dsl/methods/missing.test.js +++ b/test/api/dsl/methods/missing.test.js @@ -5,7 +5,7 @@ var BadRequestError = require.main.require('lib/api/core/errors/badRequestError'), InternalError = require.main.require('lib/api/core/errors/internalError'); -require('should-promised'); + describe('Test missing method', function () { diff --git a/test/api/dsl/methods/must.test.js b/test/api/dsl/methods/must.test.js index bfc0f26538..9b6c036a37 100644 --- a/test/api/dsl/methods/must.test.js +++ b/test/api/dsl/methods/must.test.js @@ -3,7 +3,7 @@ var rewire = require('rewire'), methods = rewire('../../../../lib/api/dsl/methods'); -require('should-promised'); + describe('Test: dsl.must method', function () { before(function () { diff --git a/test/api/dsl/methods/mustNot.test.js b/test/api/dsl/methods/mustNot.test.js index 38bde9b5ba..8c74e5e591 100644 --- a/test/api/dsl/methods/mustNot.test.js +++ b/test/api/dsl/methods/mustNot.test.js @@ -3,7 +3,7 @@ var rewire = require('rewire'), methods = rewire('../../../../lib/api/dsl/methods'); -require('should-promised'); + describe('Test: dsl.mustNot method', function () { before(function () { diff --git a/test/api/dsl/methods/or.test.js b/test/api/dsl/methods/or.test.js index 5461cd51ef..327e1eb0a6 100644 --- a/test/api/dsl/methods/or.test.js +++ b/test/api/dsl/methods/or.test.js @@ -4,7 +4,7 @@ var methods = rewire('../../../../lib/api/dsl/methods'), BadRequestError = require.main.require('lib/api/core/errors/badRequestError'); -require('should-promised'); + describe('Test or method', function () { diff --git a/test/api/dsl/methods/range.test.js b/test/api/dsl/methods/range.test.js index 7253d60725..1fa7266019 100644 --- a/test/api/dsl/methods/range.test.js +++ b/test/api/dsl/methods/range.test.js @@ -5,7 +5,7 @@ var BadRequestError = require.main.require('lib/api/core/errors/badRequestError'), InternalError = require.main.require('lib/api/core/errors/internalError'); -require('should-promised'); + describe('Test range method', function () { diff --git a/test/api/dsl/methods/should.test.js b/test/api/dsl/methods/should.test.js index 05f3bfed92..10fe600813 100644 --- a/test/api/dsl/methods/should.test.js +++ b/test/api/dsl/methods/should.test.js @@ -3,7 +3,7 @@ var rewire = require('rewire'), methods = rewire('../../../../lib/api/dsl/methods'); -require('should-promised'); + describe('Test: dsl.should method', function () { before(function () { diff --git a/test/api/dsl/methods/termFunction.test.js b/test/api/dsl/methods/termFunction.test.js index ba9e2a3e5c..4366782c67 100644 --- a/test/api/dsl/methods/termFunction.test.js +++ b/test/api/dsl/methods/termFunction.test.js @@ -5,7 +5,7 @@ var BadRequestError = require.main.require('lib/api/core/errors/badRequestError'), InternalError = require.main.require('lib/api/core/errors/internalError'); -require('should-promised'); + describe('Test: dsl.termFunction method', function () { var diff --git a/test/api/dsl/methods/unimplemented.test.js b/test/api/dsl/methods/unimplemented.test.js index ebd51432b9..50de8fa2a7 100644 --- a/test/api/dsl/methods/unimplemented.test.js +++ b/test/api/dsl/methods/unimplemented.test.js @@ -4,7 +4,7 @@ var methods = rewire('../../../../lib/api/dsl/methods'), KuzzleError = require.main.require('lib/api/core/errors/kuzzleError'); -require('should-promised'); + describe('Test unimplemented methods', function () { it('geoShape call should return a rejected promise', function () { diff --git a/test/hooks/index.test.js b/test/hooks/index.test.js index e3e9ea4781..ef1c9c19c0 100644 --- a/test/hooks/index.test.js +++ b/test/hooks/index.test.js @@ -4,7 +4,7 @@ var _ = require('lodash'), Kuzzle = require.main.require('lib/api/Kuzzle'); -require('should-promised'); + describe('Test main file for hooks managers', function () { var diff --git a/test/services/broker.test.js b/test/services/broker.test.js index 3e84c39777..76a9072c06 100644 --- a/test/services/broker.test.js +++ b/test/services/broker.test.js @@ -5,7 +5,7 @@ var rewire = require('rewire'), Broker; -require('should-promised'); + describe('Testing: broker service', function () { var diff --git a/test/services/implementations/elasticsearch.test.js b/test/services/implementations/elasticsearch.test.js index a0a0902672..30eea8f956 100644 --- a/test/services/implementations/elasticsearch.test.js +++ b/test/services/implementations/elasticsearch.test.js @@ -6,7 +6,7 @@ var RequestObject = require.main.require('lib/api/core/models/requestObject'), ES = rewire('../../../lib/services/elasticsearch'); -require('should-promised'); + describe('Test: ElasticSearch service', function () { diff --git a/test/services/implementations/internalbroker.test.js b/test/services/implementations/internalbroker.test.js index bf8391fc44..7e06c6a12e 100644 --- a/test/services/implementations/internalbroker.test.js +++ b/test/services/implementations/internalbroker.test.js @@ -5,7 +5,7 @@ var params = require('rc')('kuzzle'), Kuzzle = require.main.require('lib/api/Kuzzle'); -require('should-promised'); + /* Tests the Internal Broker implementation diff --git a/test/services/redis.test.js b/test/services/redis.test.js index 05b29db88d..d4b949be9e 100644 --- a/test/services/redis.test.js +++ b/test/services/redis.test.js @@ -5,7 +5,7 @@ var Redis = require.main.require('lib/services/redis'), Kuzzle = require.main.require('lib/api/Kuzzle'); -require('should-promised'); + describe('Test redis service', function () { var diff --git a/test/workers/write.test.js b/test/workers/write.test.js index 0968d8ba0a..6b684fda3e 100644 --- a/test/workers/write.test.js +++ b/test/workers/write.test.js @@ -6,7 +6,7 @@ var RequestObject = require.main.require('lib/api/core/models/requestObject'), Worker = rewire('../../lib/workers/write'); -require('should-promised'); + describe('Testing: write worker', function () { var