Merge branch 'develop' into feature-451-aggregations

Author: scottinet

package.json

@@ -1,6 +1,6 @@
 {
   "name": "kuzzle-sdk",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "description": "Official Javascript SDK for Kuzzle",
   "author": "The Kuzzle Team <[email protected]>",
   "repository": {

src/kuzzle.js

@@ -968,7 +968,8 @@ Kuzzle.prototype.listCollections = function () {
     index,
     options,
     cb,
-    args = Array.prototype.slice.call(arguments);
+    args = Array.prototype.slice.call(arguments),
+    query;
 
   args.forEach(function(arg) {
     switch (typeof arg) {
@@ -998,7 +999,17 @@ Kuzzle.prototype.listCollections = function () {
     collectionType = options.type;
   }
 
-  this.query({index: index, controller: 'read', action: 'listCollections'}, {body: {type: collectionType}}, options, function (err, res) {
+  query = {body: {type: collectionType}};
+
+  if (options && options.from) {
+    query.body.from = options.from;
+  }
+
+  if (options && options.size) {
+    query.body.size = options.size;
+  }
+
+  this.query({index: index, controller: 'read', action: 'listCollections'}, query, options, function (err, res) {
     if (err) {
       return cb(err);
     }

test/kuzzle/methods.test.js

@@ -339,11 +339,21 @@ describe('Kuzzle methods', function () {
       });
     });
 
-    it('should handle options correctly', function (done) {
+    it('should handle type option correctly', function (done) {
       expectedQuery.body.type = 'foobar';
       kuzzle.listCollections('foo', {type: 'foobar'}, () => done());
     });
 
+    it('should handle from option correctly', function (done) {
+      expectedQuery.body.from = 'foobar';
+      kuzzle.listCollections('foo', {from: 'foobar'}, () => done());
+    });
+
+    it('should handle size option correctly', function (done) {
+      expectedQuery.body.size = 'foobar';
+      kuzzle.listCollections('foo', {size: 'foobar'}, () => done());
+    });
+
     it('should use the default index if none is provided', function () {
       kuzzle.setDefaultIndex('foo');
       kuzzle.listCollections(function () {});