Merge remote-tracking branch 'origin/develop' into develop-implement-scroll

Author: scottinet

src/kuzzle.js

@@ -1283,6 +1283,14 @@ Kuzzle.prototype.query = function (queryArgs, query, options, cb) {
       object.refresh = options.refresh;
     }
 
+    if (options.from) {
+      object.from = options.from;
+    }
+
+    if (options.size) {
+      object.size = options.size;
+    }
+
     if (options.metadata) {
       Object.keys(options.metadata).forEach(function (meta) {
         object.metadata[meta] = options.metadata[meta];

src/kuzzleDataCollection.js

@@ -288,28 +288,6 @@ KuzzleDataCollection.prototype.fetchAllDocuments = function (options, cb) {
     options = null;
   }
 
-  // copying pagination options to the search filter
-  if (options && options.scroll) {
-    filters.scroll = options.scroll;
-    delete options.scroll;
-  }
-
-  if (options && options.from) {
-    filters.from = options.from;
-    delete options.from;
-  }
-  else {
-    filters.from = 0;
-  }
-
-  if (options && options.size) {
-    filters.size = options.size;
-    delete options.size;
-  }
-  else {
-    filters.size = 1000;
-  }
-
   this.kuzzle.callbackRequired('KuzzleDataCollection.fetchAllDocuments', cb);
 
   this.search(filters, options, function getNextDocuments (error, searchResult) {
@@ -516,7 +494,7 @@ KuzzleDataCollection.prototype.scroll = function (scrollId, options, filters, cb
 
   this.kuzzle.callbackRequired('KuzzleDataCollection.scroll', cb);
 
-  this.kuzzle.query({controller: 'read', action: 'scroll'}, request, options, function (error, result) {
+  this.kuzzle.query({controller: 'document', action: 'scroll'}, request, options, function (error, result) {
     var documents = [];
 
     if (error) {

test/kuzzle/methods.test.js

@@ -345,12 +345,12 @@ describe('Kuzzle methods', function () {
     });
 
     it('should handle from option correctly', function (done) {
-      expectedQuery.body.from = 'foobar';
+      expectedQuery.from = 'foobar';
       kuzzle.listCollections('foo', {from: 'foobar'}, () => done());
     });
 
     it('should handle size option correctly', function (done) {
-      expectedQuery.body.size = 'foobar';
+      expectedQuery.size = 'foobar';
       kuzzle.listCollections('foo', {size: 'foobar'}, () => done());
     });
 

test/kuzzle/query.test.js

@@ -172,6 +172,22 @@ describe('Query management', function () {
       should(requestObject.refresh).match(refresh);
     });
 
+    it('should handle option size properly', function () {
+      var
+        size = 'foo';
+
+      kuzzle.query(queryArgs, { body: { some: 'query'}}, {size: size});
+      should(requestObject.size).match(size);
+    });
+
+    it('should handle option from properly', function () {
+      var
+        from = 'foo';
+
+      kuzzle.query(queryArgs, { body: { some: 'query'}}, {from: from});
+      should(requestObject.from).match(from);
+    });
+
     it('should exit early if the query is not queuable and the SDK is offline', function () {
       kuzzle.state = 'offline';
       kuzzle.query(queryArgs, { body: { some: 'query'}}, {queuable: false});

test/kuzzleDataCollection/methods.test.js

@@ -166,7 +166,7 @@ describe('KuzzleDataCollection methods', function () {
         };
 
       queryScrollStub = function (args, query, opts, callback) {
-        should(args.controller).be.exactly('read');
+        should(args.controller).be.exactly('document');
         should(args.action).be.exactly('scroll');
         should(query.body.scroll).be.exactly(options.scroll);
         should(query.body.scrollId).be.exactly(scrollId);
@@ -201,7 +201,7 @@ describe('KuzzleDataCollection methods', function () {
         };
 
       queryScrollStub = function (args, query, opts, callback) {
-        should(args.controller).be.exactly('read');
+        should(args.controller).be.exactly('document');
         should(args.action).be.exactly('scroll');
         should(query.body.scrollId).be.exactly(scrollId);
         should(opts).be.null();
@@ -601,6 +601,13 @@ describe('KuzzleDataCollection methods', function () {
     beforeEach(function () {
       kuzzle = new Kuzzle('foo', {defaultIndex: 'bar'});
       emitted = false;
+      expectedQuery = {
+        index: 'bar',
+        collection: 'foo',
+        action: 'get',
+        controller: 'document',
+        body: {}
+      };
     });
 
     it('should forward the query to the search method', function () {
@@ -652,7 +659,7 @@ describe('KuzzleDataCollection methods', function () {
 
       collection.fetchAllDocuments({from: 123, size: 456}, function () {});
       should(stub.calledOnce).be.true();
-      should(stub.calledWithMatch({from: 123, size: 456})).be.true();
+      should(stub.calledWithMatch({}, {from: 123, size: 456})).be.true();
       stub.restore();
     });
 
@@ -663,7 +670,8 @@ describe('KuzzleDataCollection methods', function () {
 
       collection.fetchAllDocuments({scroll: '30s'}, function () {});
       should(stub.calledOnce).be.true();
-      should(stub.calledWithMatch({from: 0, size: 1000, scroll: '30s'})).be.true();
+      console.dir(stub.firstCall.args, {depth: null});
+      should(stub.calledWith({}, {scroll: '30s'}, sinon.match.func)).be.true();
       stub.restore();
     });