Merge pull request #14 from kuzzleio/unitTests

added unit tests on the main kuzzle object constructor + bugfixes

Author: scottinet

.gitignore

@@ -16,4 +16,4 @@ examples/node_modules/
 
 # Compiled files
 browser/
-
+coverage/

.travis.yml

@@ -3,7 +3,7 @@ language: node_js
 node_js:
 - '4.2'
 script:
-- grunt
+- grunt && npm test
 before_install: npm install -g grunt-cli
 install: npm install
 after_deploy:
@@ -30,3 +30,6 @@ deploy:
   on:
     repo: kuzzleio/sdk-javascript
     branch: master
+notifications:
+  slack:
+    secure: m0BEda/eXxYkil0zDZ1uNpK13kiNbb5/80I5OqDBz6X7/WH3uhWIV6q38lI929tQKz04eHAfVDaRSoPk1XwZBnb70MgcRmSG/m4/moR7BCnx7D9hHFqhNf0EfdzwEg44dCCVtD2vUvChtYV+jK74sNd4yqeq86YXi33qS7SYLS6kYnRloX0D7sQXDy14FWU2a5+hsrPX8yBoWuPjBergvK6W1dZAG+SfDywaqsrUDs+q64yEHiYV9VlvVZ/oKXZiDnVcB2hi0uulIZ8+iZaMJFEU30uCQiK6w3HG587yx3sVJmprr64ZYHKaFJD2ZAG1td6wJ1ccJsU/ruGkj4+0CeoZUYYBYXYQ4qhQl8F2QT0m+8dWqPwzYpxEoqyvGS9ioZG/YI18V2CE1pEyc72JzEv6c3AgDbtwrLH5s3ViNts7kulk3wwCzuAww+DapSV9ggezo+Bs7OGRpXwh/saeKWUCLqTkLQTjuq2dFVdo85HsC2RrLcSsZLMTOuV/A//FNBDJBlNnuneGP84zGkWGPEja0FFXvm2TS95gh1hd2PMe+QxjygOAvIMLmDmfdlWSLayUeWbqp20EdF7TUHV0dvBucga8s3UvFhIMnnGLS9vcNEIRtVornXznwdYSLbYD0mLXNtitneXTnSAxilThKtGDPOWQFkYkyoFV9FEwKO8=

package.json

@@ -1,7 +1,7 @@
 {
   "name": "kuzzle-sdk",
-  "version": "1.0.0-alpha.5",
-  "description": "A connector for the Kuzzle API",
+  "version": "1.0.0-alpha.6",
+  "description": "Official Javascript SDK for Kuzzle",
   "author": "The Kuzzle Team <[email protected]>",
   "repository": {
     "type": "git",
@@ -11,24 +11,33 @@
   "keywords": [
     "kuzzle",
     "baas",
-    "real-time",
-    "advanced-search",
+    "backend",
+    "realtime",
+    "advanced search",
     "bulk"
   ],
+  "scripts": {
+    "test": "istanbul cover _mocha  -- --recursive "
+  },
   "browser": "src/kuzzle.js",
   "main": "index.js",
   "license": "Apache-2.0",
   "dependencies": {
     "bluebird": "3.0.5",
-    "node-uuid": "1.4.3",
+    "node-uuid": "1.4.7",
     "socket.io-client": "1.3.7"
   },
   "devDependencies": {
     "browserify": "12.0.1",
     "grunt": "0.4.5",
     "grunt-browserify": "^4.0.1",
     "grunt-contrib-jshint": "^0.11.3",
+    "grunt-contrib-uglify": "0.10.1",
     "gruntify-eslint": "^1.0.1",
-    "grunt-contrib-uglify": "0.9.1"
+    "istanbul": "0.4.0",
+    "istanbul-middleware": "0.2.1",
+    "mocha": "2.3.3",
+    "rewire": "^2.5.0",
+    "should": "7.1.1"
   }
 }

src/kuzzle.js

@@ -27,6 +27,8 @@ var
  * @constructor
  */
 module.exports = Kuzzle = function (url, options, cb) {
+  var self = this;
+
   if (!(this instanceof Kuzzle)) {
     return new Kuzzle(url, options, cb);
   }
@@ -86,11 +88,11 @@ module.exports = Kuzzle = function (url, options, cb) {
     },
     // read-only properties
     autoReconnect: {
-      value: (options && options.autoReconnect) ? options.autoReconnect : true,
+      value: (options && typeof options.autoReconnect === 'boolean') ? options.autoReconnect : true,
       enumerable: true
     },
     reconnectionDelay: {
-      value: (options && options.reconnectionDelay) ? options.reconnectionDelay : 1000,
+      value: (options && typeof options.reconnectionDelay === 'number') ? options.reconnectionDelay : 1000,
       enumerable: true
     },
     // writable properties
@@ -158,8 +160,8 @@ module.exports = Kuzzle = function (url, options, cb) {
 
   if (options) {
     Object.keys(options).forEach(function (opt) {
-      if (this.hasOwnProperty(opt) && Object.getOwnPropertyDescriptor(this, opt).writable) {
-        this[opt] = options[opt];
+      if (self.hasOwnProperty(opt) && Object.getOwnPropertyDescriptor(self, opt).writable) {
+        self[opt] = options[opt];
       }
     });
 
@@ -169,6 +171,7 @@ module.exports = Kuzzle = function (url, options, cb) {
   }
 
   // Helper function ensuring that this Kuzzle object is still valid before performing a query
+  // istanbul ignore next
   Object.defineProperty(this, 'isValid', {
     value: function () {
       if (this.socket === null) {
@@ -178,6 +181,7 @@ module.exports = Kuzzle = function (url, options, cb) {
   });
 
   // Helper function copying headers to the query data
+  // istanbul ignore next
   Object.defineProperty(this, 'addHeaders', {
     value: function (query, headers) {
       Object.keys(headers).forEach(function (header) {
@@ -194,6 +198,7 @@ module.exports = Kuzzle = function (url, options, cb) {
    * Some methods (mainly read queries) require a callback function. This function exists to avoid repetition of code,
    * and is called by these methods
    */
+  // istanbul ignore next
   Object.defineProperty(this, 'callbackRequired', {
     value: function (errorMessagePrefix, callback) {
       if (!callback || typeof callback !== 'function') {
@@ -232,7 +237,11 @@ function construct(url, cb) {
     throw new Error('URL to Kuzzle can\'t be empty');
   }
 
-  self.socket = io(url, {reconnection: this.autoReconnect, reconnectionDelay: this.reconnectionDelay});
+  self.socket = io(url, {
+    reconnection: this.autoReconnect,
+    reconnectionDelay: this.reconnectionDelay,
+    'force new connection': true
+  });
 
   self.socket.once('connect', function () {
     self.state = 'connected';
@@ -242,7 +251,7 @@ function construct(url, cb) {
     }
   });
 
-  self.socket.once('error', function (error) {
+  self.socket.once('connect_error', function (error) {
     self.state = 'error';
     self.logout();
 
@@ -283,8 +292,8 @@ function construct(url, cb) {
 
     // replay queued requests
     if (self.autoReplay) {
-      cleanQueue.call(this);
-      dequeue.call(this);
+      cleanQueue.call(self);
+      dequeue.call(self);
     }
 
     // alert listeners
@@ -414,8 +423,6 @@ Kuzzle.prototype.addListener = function(event, listener) {
  * @returns {object} this
  */
 Kuzzle.prototype.getAllStatistics = function (options, cb) {
-  this.isValid();
-
   if (!cb && typeof options === 'function') {
     cb = options;
     options = null;
@@ -470,7 +477,6 @@ Kuzzle.prototype.getStatistics = function (timestamp, options, cb) {
     }
   }
 
-  this.isValid();
   this.callbackRequired('Kuzzle.getStatistics', cb);
 
   if (!timestamp) {
@@ -549,8 +555,6 @@ Kuzzle.prototype.flushQueue = function () {
  * @returns {object} this
  */
 Kuzzle.prototype.listCollections = function (options, cb) {
-  this.isValid();
-
   if (!cb && typeof options === 'function') {
     cb = options;
     options = null;
@@ -593,8 +597,6 @@ Kuzzle.prototype.logout = function () {
  * @returns {object} this
  */
 Kuzzle.prototype.now = function (options, cb) {
-  this.isValid();
-
   if (!cb && typeof options === 'function') {
     cb = options;
     options = null;
@@ -707,8 +709,6 @@ Kuzzle.prototype.removeAllListeners = function (event) {
     knownEvents = Object.keys(this.eventListeners),
     self = this;
 
-  this.isValid();
-
   if (event) {
     if (knownEvents.indexOf(event) === -1) {
       throw new Error('[' + event + '] is not a known event. Known events: ' + knownEvents.toString());
@@ -733,8 +733,6 @@ Kuzzle.prototype.removeListener = function (event, listenerId) {
     knownEvents = Object.keys(this.eventListeners),
     self = this;
 
-  this.isValid();
-
   if (knownEvents.indexOf(event) === -1) {
     throw new Error('[' + event + '] is not a known event. Known events: ' + knownEvents.toString());
   }