Update the test-search to the current stable ES API

Author: hmalphettes

lib/readable-search.js

@@ -53,7 +53,7 @@ ReadableHits.prototype._fetchNextPage = function() {//size) {
       self.emit('error', e);
       return self.push(null);
     }
-    self.total = resp.hits.hits.length;
+    self.total = resp.hits.total;
     self._hits = resp.hits.hits;
     self.from += self._hits.length;
     if (self.from >= self.total) {

test/test-search.js

@@ -78,7 +78,7 @@ describe('When getting documents by id', function() {
           index: 'myindex',
           type: 'mytype',
           body: {
-            docs: { ids: docs }
+            ids: docs
           }
         }, callback);
       };
@@ -110,6 +110,7 @@ function populateIndex(nb, done) {
       cmds.push({ index:  { _index: 'myindex', _type: 'mytype', _id: rec._id } });
       cmds.push(rec);
       ids.push(rec._id);
+      rec._id = undefined;
     }
     client.bulk({
       body: cmds
@@ -135,16 +136,19 @@ function checkRecords(rs, ts, nb, done) {
   };
   var errClosure = function(e) {
     err = e;
+    var complete = done;
+    done = null;
+    return complete(e);
   };
   rs.on('error', errClosure);
   ws.on('error', errClosure);
   if (ts) {
     ts.on('error', errClosure);
   }
   function onFinish() {
-    if (err) { return done(err); }
+    if (err) { return done && done(err); }
     expect(hits.length).to.equal(nb);
-    done();
+    done && done();
   }
   if (ts) {
     rs.pipe(ts).pipe(ws).on('finish', onFinish);

test/test-write.js

@@ -26,7 +26,9 @@ describe('When writing', function() {
     });
 
     var transformToBulk = new TransformToBulk(function(doc) {
-      return { _id: doc._id };
+      var docId = doc._id;
+      doc._id = undefined;
+      return { _id: docId };
     });
     // drop the index then
     client.indices.delete({index: 'myindex2'}, function() {